[globus-xio-pipe-driver/f18] Specfile clean-up

[Mattias Ellert]

commit cf404564f8e7e5055d7fc4a84111ce086f9c088c
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 14:17:57 2012 +0100

    Specfile clean-up

 globus-xio-pipe-driver.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/globus-xio-pipe-driver.spec b/globus-xio-pipe-driver.spec
index 4adb51d..5eb86ec 100644
--- a/globus-xio-pipe-driver.spec
+++ b/globus-xio-pipe-driver.spec
@@ -7,7 +7,7 @@
 Name:		globus-xio-pipe-driver
 %global _name %(tr - _ <<< %{name})
 Version:	2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Pipe Driver
 
 Group:		System Environment/Libraries
@@ -74,15 +74,15 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 
 # This library is opened using lt_dlopenext, so the libtool archive
 # (.la file) can not be removed - fix the libdir and clear dependency_libs
 # ... and move it to the main package
-for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
+for lib in `find %{buildroot}%{_libdir} -name 'lib*.la'` ; do
   sed -e "s!^libdir=.*!libdir=\'%{_libdir}\'!" \
       -e "s!^dependency_libs=.*!dependency_libs=\'\'!" -i $lib
 done
@@ -91,8 +91,7 @@ grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
 sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Install README file
-install -m 644 -p %{SOURCE8} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -103,7 +102,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -119,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-3
+- Specfile clean-up
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild