[globus-gram-job-manager-fork/f18] Specfile clean-up

[Mattias Ellert]

commit 08b8258dabac5b2031d6dff94e5e3629ca7c4bbc
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 19:22:59 2012 +0100

    Specfile clean-up

 globus-gram-job-manager-fork.spec |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/globus-gram-job-manager-fork.spec b/globus-gram-job-manager-fork.spec
index 9b3c8a2..8086951 100644
--- a/globus-gram-job-manager-fork.spec
+++ b/globus-gram-job-manager-fork.spec
@@ -9,7 +9,7 @@
 Name:		globus-gram-job-manager-fork
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Fork Job Manager Support
 
 Group:		Applications/Internet
@@ -119,15 +119,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
@@ -136,7 +136,7 @@ grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
 sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Remove jobmanager-fork from install dir - leave it for admin configuration
-rm $RPM_BUILD_ROOT/etc/grid-services/jobmanager-fork
+rm %{buildroot}/etc/grid-services/jobmanager-fork
 
 # Move script man pages to progs package
 grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
@@ -144,12 +144,11 @@ grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.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
 
 # Devel package is redundant
-rm $RPM_BUILD_ROOT%{_libdir}/libglobus_seg_fork.so
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/globus-gram-job-manager-fork.pc
+rm %{buildroot}%{_libdir}/libglobus_seg_fork.so
+rm %{buildroot}%{_libdir}/pkgconfig/globus-gram-job-manager-fork.pc
 rm $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_%{flavor}_dev.gpt
 
@@ -166,7 +165,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed 's!^!%doc %{_prefix}!' > package.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %preun setup-poll
 if [ $1 -eq 0 ]; then
@@ -206,6 +205,9 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/fork
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Specfile clean-up
+
 * Sat Apr 28 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
 - Update to Globus Toolkit 5.2.1
 - Drop patch globus-gram-jobmanager-fork-desc.patch (fixed upstream)