[globus-rls-server/f18] Specfile clean-up

Mattias Ellert ellert at fedoraproject.org
Thu Dec 20 12:59:03 UTC 2012 

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

    Specfile clean-up

 globus-rls-server.spec |   68 ++++++++++++++++++++++++-----------------------
 1 files changed, 35 insertions(+), 33 deletions(-)
---
diff --git a/globus-rls-server.spec b/globus-rls-server.spec
index cd58d84..f7d7993 100644
--- a/globus-rls-server.spec
+++ b/globus-rls-server.spec
@@ -8,7 +8,7 @@ Name:		globus-rls-server
 %global _name %(tr - _ <<< %{name})
 Version:	4.9
 %global setupversion 4.5
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Server
 
 Group:		Applications/Internet
@@ -133,82 +133,81 @@ make %{?_smp_mflags}
 cd -
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # setup package
 cd %{_name}_setup-%{setupversion}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 cd -
 
 # This script is intended to be sourced, not executed
-chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-rls-server.pl
+chmod 644 %{buildroot}%{_datadir}/globus/setup/setup-globus-rls-server.pl
 
 # Create setup files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}
 sed -e s!@libdir@!%{_libdir}!g \
     -e s!@localstatedir@!%{_localstatedir}/lib/%{name}!g \
     -e s!@SQLITEODBCFLAVOR@!!g \
     -e s!@LIBSUFFIX@!so!g \
-  $RPM_BUILD_ROOT%{_datadir}/globus/setup/odbc.ini.in > \
-  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-odbc.ini
+  %{buildroot}%{_datadir}/globus/setup/odbc.ini.in > \
+  %{buildroot}%{_sysconfdir}/%{name}-odbc.ini
 sed -e s!@ODBCINI@!%{_sysconfdir}/%{name}-odbc.ini!g \
     -e 's!^odbcini.*$!&\npidfile\t\t\t/var/run/%{name}.pid!g' \
-  $RPM_BUILD_ROOT%{_datadir}/globus/setup/%{name}.conf.in > \
-  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+  %{buildroot}%{_datadir}/globus/setup/%{name}.conf.in > \
+  %{buildroot}%{_sysconfdir}/%{name}.conf
+chmod 600 %{buildroot}%{_sysconfdir}/%{name}.conf
 sed s!@sbindir@!%{_sbindir}!g \
-  $RPM_BUILD_ROOT%{_datadir}/globus/setup/rls-ldif.conf.in > \
-  $RPM_BUILD_ROOT%{_sysconfdir}/rls-ldif.conf
+  %{buildroot}%{_datadir}/globus/setup/rls-ldif.conf.in > \
+  %{buildroot}%{_sysconfdir}/rls-ldif.conf
 
-GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 
 # Remove the SXXrls.in file
-rm $RPM_BUILD_ROOT%{_datadir}/globus/setup/SXXrls.in
+rm %{buildroot}%{_datadir}/globus/setup/SXXrls.in
 sed /SXXrls.in/d -i $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_data.filelist
 sed -e 's/"SXXrls", //' -e '/SXXrls/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-rls-server.pl
+  -i %{buildroot}%{_datadir}/globus/setup/setup-globus-rls-server.pl
 
 # Fix man page section
 sed 's!^\(\.TH.*\) 1 !\1 8 !' \
-  $RPM_BUILD_ROOT%{_mandir}/man1/globus-rls-reporter.1 > \
-  $RPM_BUILD_ROOT%{_mandir}/man8/globus-rls-reporter.8
-rm $RPM_BUILD_ROOT%{_mandir}/man1/globus-rls-reporter.1
+  %{buildroot}%{_mandir}/man1/globus-rls-reporter.1 > \
+  %{buildroot}%{_mandir}/man8/globus-rls-reporter.8
+rm %{buildroot}%{_mandir}/man1/globus-rls-reporter.1
 sed 's!/man1/\(.*\)\.1!/man8/\1.8!' \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Install start-up script
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+mkdir -p %{buildroot}%{_initrddir}
+install -p %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
 
 # Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE %{buildroot}%{_docdir}/%{name}-%{version}
 
 # 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
 
 # Install post installation instructions
 install -m 644 -p %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.Fedora
+  %{buildroot}%{_docdir}/%{name}-%{version}/README.Fedora
 
 # Adapt to different versions of the mysql connector
 %if %{?fedora}%{!?fedora:0} <= 4 && %{?rhel}%{!?rhel:0} <= 4
 sed s/mysql-connector-odbc/MyODBC/ \
-  -i $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.Fedora
+  -i %{buildroot}%{_docdir}/%{name}-%{version}/README.Fedora
 sed s/libmyodbc3_r/libmyodbc/ \
-  -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-odbc.ini \
-     $RPM_BUILD_ROOT%{_datadir}/globus/setup/odbc.ini.in
+  -i %{buildroot}%{_sysconfdir}/%{name}-odbc.ini \
+     %{buildroot}%{_datadir}/globus/setup/odbc.ini.in
 %endif
 %if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
 sed s/libmyodbc3_r/libmyodbc5/ \
-  -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-odbc.ini \
-     $RPM_BUILD_ROOT%{_datadir}/globus/setup/odbc.ini.in
+  -i %{buildroot}%{_sysconfdir}/%{name}-odbc.ini \
+     %{buildroot}%{_datadir}/globus/setup/odbc.ini.in
 %endif
 
 # Remove pkg-config files...
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+rm %{buildroot}%{_libdir}/pkgconfig/*.pc
 rm $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_%{flavor}_dev.gpt
 rm $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_dev.filelist
@@ -225,7 +224,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
   > package.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 if [ $1 -eq 1 ]; then
@@ -259,6 +258,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/README.Fedora
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-12
+- Specfile clean-up
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

More information about the scm-commits mailing list