[globus-gfork/f18] Specfile clean-up

[Mattias Ellert]

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

    Specfile clean-up

 globus-gfork.spec |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/globus-gfork.spec b/globus-gfork.spec
index 2f8acf7..b4325ef 100644
--- a/globus-gfork.spec
+++ b/globus-gfork.spec
@@ -7,7 +7,7 @@
 Name:		globus-gfork
 %global _name %(tr - _ <<< %{name})
 Version:	3.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - GFork
 
 Group:		System Environment/Libraries
@@ -91,26 +91,25 @@ 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
 
 # Remove libtool archives (.la files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
+find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
 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
 
 # Add empty default configuration file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}
 echo "# This is the default gfork configuration file" > \
-  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf
+  %{buildroot}%{_sysconfdir}/gfork.conf
 
 # Remove README.txt from main package
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.txt
+rm %{buildroot}%{_docdir}/%{name}-%{version}/README.txt
 sed '/README.txt/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Generate package filelists
@@ -124,7 +123,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
 
@@ -145,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-3
+- Specfile clean-up
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild