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

[Mattias Ellert]

commit b8fd6325b809d69f7da177394da820330310d484
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 18:32:22 2012 +0100

    Specfile clean-up

 globus-gram-job-manager-scripts.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/globus-gram-job-manager-scripts.spec b/globus-gram-job-manager-scripts.spec
index 8ec814b..67d6600 100644
--- a/globus-gram-job-manager-scripts.spec
+++ b/globus-gram-job-manager-scripts.spec
@@ -3,7 +3,7 @@
 Name:		globus-gram-job-manager-scripts
 %global _name %(tr - _ <<< %{name})
 Version:	4.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - GRAM Job ManagerScripts
 
 Group:		Applications/Internet
@@ -64,10 +64,10 @@ unset GPT_LOCATION
 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
 
 # Move license file to main package
 grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
@@ -80,8 +80,7 @@ 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
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist \
@@ -91,7 +90,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f package.filelist
 %defattr(-,root,root,-)
@@ -108,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.2-5
+- Specfile clean-up
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -117,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jan 24 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.2-2
 - Fix broken links in README file
 
-* Sat Dec 17 2011 Mattias Ellert <mattias.ellert at fyssst.uu.se> - 4.2-1
+* Sat Dec 17 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.2-1
 - Post-release update from upstream
 
 * Thu Dec 15 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-1