[globus-rls-server/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit f1b84b4f18cf4b09633db38e53dcaffc25358d1a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:20:05 2013 +0200

    Implement updated packaging guidelines

 globus-rls-server.spec |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/globus-rls-server.spec b/globus-rls-server.spec
index d144fc4..2bef573 100644
--- a/globus-rls-server.spec
+++ b/globus-rls-server.spec
@@ -4,11 +4,13 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-rls-server
 %global _name %(tr - _ <<< %{name})
 Version:	4.9
 %global setupversion 4.5
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Server
 
 Group:		Applications/Internet
@@ -54,13 +56,13 @@ Requires:	globus-usage%{?_isa} >= 3
 Requires:	globus-gss-assist%{?_isa} >= 8
 Requires:	globus-io%{?_isa} >= 9
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-rls-client-devel%{?_isa} >= 5.2-5
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-usage-devel%{?_isa} >= 3
-BuildRequires:	globus-gss-assist-devel%{?_isa} >= 8
-BuildRequires:	globus-io-devel%{?_isa} >= 9
-BuildRequires:	unixODBC-devel%{?_isa}
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-rls-client-devel >= 5.2-5
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-usage-devel >= 3
+BuildRequires:	globus-gss-assist-devel >= 8
+BuildRequires:	globus-io-devel >= 9
+BuildRequires:	unixODBC-devel
 
 Requires(post):		chkconfig
 Requires(preun):	chkconfig
@@ -105,7 +107,7 @@ unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version}
+	   --with-docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -126,7 +128,7 @@ unset GLOBUS_LOCATION
 unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-%configure --without-flavor --with-docdir=%{_docdir}/%{name}-%{version}
+%configure --without-flavor --with-docdir=%{_pkgdocdir}
 
 make %{?_smp_mflags}
 
@@ -182,20 +184,20 @@ mkdir -p %{buildroot}%{_initrddir}
 install -p %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
 
 # Install license file
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE %{buildroot}%{_docdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{_pkgdocdir}
+install -m 644 -p GLOBUS_LICENSE %{buildroot}%{_pkgdocdir}
 
 # Install README file
-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
 # Install post installation instructions
 install -m 644 -p %{SOURCE3} \
-  %{buildroot}%{_docdir}/%{name}-%{version}/README.Fedora
+  %{buildroot}%{_pkgdocdir}/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 %{buildroot}%{_docdir}/%{name}-%{version}/README.Fedora
+  -i %{buildroot}%{_pkgdocdir}/README.Fedora
 sed s/libmyodbc3_r/libmyodbc/ \
   -i %{buildroot}%{_sysconfdir}/%{name}-odbc.ini \
      %{buildroot}%{_datadir}/globus/setup/odbc.ini.in
@@ -223,6 +225,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
 	-e 's!%{_prefix}%{_sysconfdir}!%config(noreplace) %{_sysconfdir}!' \
   > package.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %post
 if [ $1 -eq 1 ]; then
   /sbin/chkconfig --add %{name}
@@ -241,9 +246,9 @@ fi
 
 %files -f package.filelist
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
+%doc %{_pkgdocdir}/README
 %dir %{_datadir}/globus/packages/%{_name}_setup
 %dir %{_datadir}/globus/aggrexec
 %dir %{_datadir}/globus/setup
@@ -251,9 +256,12 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/rls-ldif.conf
 %{_initrddir}/%{name}
-%doc %{_docdir}/%{name}-%{version}/README.Fedora
+%doc %{_pkgdocdir}/README.Fedora
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-15
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-14
 - Add aarch64 to the list of 64 bit platforms