[globus-gatekeeper/f18] Specfile clean-up

[Mattias Ellert]

commit 9fb60da1f89a8102be7ce1b01f53fb8f17f7e006
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 17:03:02 2012 +0100

    Specfile clean-up

 globus-gatekeeper.spec |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/globus-gatekeeper.spec b/globus-gatekeeper.spec
index 8e99e03..e375d3b 100644
--- a/globus-gatekeeper.spec
+++ b/globus-gatekeeper.spec
@@ -9,7 +9,7 @@
 Name:		globus-gatekeeper
 %global _name %(tr - _ <<< %{name})
 Version:	9.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Gatekeeper
 
 Group:		Applications/Internet
@@ -73,26 +73,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 start-up script
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+rm -rf %{buildroot}%{_sysconfdir}/init.d
 sed '/init\.d/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
 
 # Install start-up script
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p %{buildroot}%{_initrddir}
+install -p %{SOURCE1} %{buildroot}%{_initrddir}
 
 # Install post installation instructions
 install -m 644 -p %{SOURCE2} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.Fedora
+  %{buildroot}%{_docdir}/%{name}-%{version}/README.Fedora
 
 # 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}_pgm.filelist \
@@ -103,11 +102,11 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
 
-mkdir -p $RPM_BUILD_ROOT/etc/grid-services
-mkdir -p $RPM_BUILD_ROOT/etc/grid-services/available
+mkdir -p %{buildroot}/etc/grid-services
+mkdir -p %{buildroot}/etc/grid-services/available
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 if [ $1 -eq 1 ]; then
@@ -136,6 +135,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/README.Fedora
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.14-2
+- Specfile clean-up
+
 * Sun Jul 22 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.14-1
 - Update to Globus Toolkit 5.2.2
 - Drop patch globus-gatekeeper-porting.patch (fixed upstream)