[myproxy] - Support systemd for epel7 and fedora17 and up: http://bugzilla.globus.org/bugzilla/show_bug.cgi?

[stevetraylen]

commit 015d56a15ba0551a585118280e8b3eb990eb2052
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Fri Feb 24 03:14:52 2012 +0100

    - Support systemd for epel7 and fedora17 and up:
      http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7240
    - Switch from RPM_BUILD_ROOT to %buildoot.

 myproxy.spec |   53 +++++++++++++++++++++++++++--------------------------
 1 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/myproxy.spec b/myproxy.spec
index faf6ce3..74eff77 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -224,36 +224,36 @@ 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 %{buildoot}
+make install DESTDIR=%{buildoot}
 
-GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+GLOBUSPACKAGEDIR=%{buildoot}%{_datadir}/globus/packages
 
 # Remove libtool libraries (.a files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
+find %{buildoot}%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+find %{buildoot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
 sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{name}/%{flavor}_dev.filelist
 sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{name}/%{flavor}_dev.filelist
 
 # Put documentation in Fedora defaults and alter GPT package lists.
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
+mkdir -p %{buildoot}%{_defaultdocdir}/%{name}-doc-%{version}/extras
 for FILE in login.html myproxy-accepted-credentials-mapapp \
             myproxy-cert-checker myproxy-certificate-mapapp \
             myproxy-certreq-checker myproxy-crl.cron myproxy.cron \
             myproxy-get-delegation.cgi myproxy-get-trustroots.cron \
             myproxy-passphrase-policy myproxy-revoke
 do
-   mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
-      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
+   mv %{buildoot}%{_usr}/share/%{name}/$FILE \
+      %{buildoot}%{_defaultdocdir}/%{name}-doc-%{version}/extras
    sed "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" \
       -i $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
+mkdir -p %{buildoot}%{_defaultdocdir}/%{name}-%{version}
 for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
 do
-  mv  $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
-      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
+  mv  %{buildoot}%{_usr}/share/%{name}/$FILE \
+      %{buildoot}%{_defaultdocdir}/%{name}-%{version}/.
   sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
 done
 
@@ -261,37 +261,37 @@ done
 for FILE in etc.inetd.conf.modifications etc.init.d.myproxy.nonroot etc.services.modifications  \
             etc.xinetd.myproxy etc.init.d.myproxy
 do
-  rm $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE
+  rm %{buildoot}%{_usr}/share/%{name}/$FILE
   sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
 done
 
 # Move example configuration file into place.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
-   $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p %{buildoot}%{_sysconfdir}
+mv %{buildoot}%{_datadir}/%{name}/myproxy-server.config \
+   %{buildoot}%{_sysconfdir}
 sed -i "/share\/%{name}\/myproxy-server.config/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
 
 %if 0%{with_sysv}
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install  -m 755 myproxy.init $RPM_BUILD_ROOT%{_initddir}/myproxy-server
-install  -m 644 myproxy.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/myproxy-server
+mkdir -p %{buildoot}%{_initddir}
+mkdir -p %{buildoot}%{_sysconfdir}/sysconfig
+install  -m 755 myproxy.init %{buildoot}%{_initddir}/myproxy-server
+install  -m 644 myproxy.sysconfig %{buildoot}%{_sysconfdir}/sysconfig/myproxy-server
 %else
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-install -p myproxy-server-tmpfiles.d.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/myproxy-server.conf
-install -p myproxy-server.service $RPM_BUILD_ROOT%{_unitdir}/myproxy-server.service
+mkdir -p %{buildoot}%{_unitdir}
+mkdir -p %{buildoot}%{_sysconfdir}/tmpfiles.d
+install -p myproxy-server-tmpfiles.d.conf %{buildoot}%{_sysconfdir}/tmpfiles.d/myproxy-server.conf
+install -p myproxy-server.service %{buildoot}%{_unitdir}/myproxy-server.service
 mkdir -p %{buildroot}%{_localstatedir}/run/
 install -d -m 0710 %{buildroot}%{_localstatedir}/run/myproxy-server/
 %endif
 
-mkdir -p $RPM_BUILD_ROOT%{_var}/lib/myproxy
+mkdir -p %{buildoot}%{_var}/lib/myproxy
 
 # Create a directory to hold myproxy owned host certificates.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy
+mkdir -p %{buildoot}%{_sysconfdir}/grid-security/myproxy
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildoot}
 
 %check 
 %if 0%{?with_checks}
@@ -442,6 +442,7 @@ fi
   since added upstream.
 - Support systemd for epel7 and fedora17 and up:
   http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7240
+- Switch from RPM_BUILD_ROOT to %%buildoot.
 
 * Thu Feb 2 2012 Steve Traylen <steve.traylen at cern.ch> - 5.5-3
 - Drop EPEL4 packaging since EOL.