[globus-gram-job-manager/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit a9a309318778678afc42dfdc740d761dbeb34110
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:56:25 2013 +0200

    Implement updated packaging guidelines

 globus-gram-job-manager.spec |   52 ++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/globus-gram-job-manager.spec b/globus-gram-job-manager.spec
index b753111..7679dfb 100644
--- a/globus-gram-job-manager.spec
+++ b/globus-gram-job-manager.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gram-job-manager
 %global _name %(tr - _ <<< %{name})
 Version:	13.51
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - GRAM Jobmanager
 
 Group:		Applications/Internet
@@ -43,22 +45,22 @@ Requires:	globus-gass-cache-program >= 5
 Requires:	globus-gatekeeper >= 9
 Requires:	psmisc
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-gsi-credential-devel%{?_isa} >= 5
-BuildRequires:	globus-scheduler-event-generator-devel%{?_isa} >= 4
-BuildRequires:	globus-xio-popen-driver-devel%{?_isa} >= 2
-BuildRequires:	globus-xio-devel%{?_isa} >= 3
-BuildRequires:	globus-gss-assist-devel%{?_isa} >= 8
-BuildRequires:	globus-callout-devel%{?_isa} >= 2
-BuildRequires:	globus-gram-job-manager-callout-error-devel%{?_isa} >= 2
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 10
-BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 11
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 5
-BuildRequires:	globus-usage-devel%{?_isa} >= 3
-BuildRequires:	globus-rsl-devel%{?_isa} >= 9
-BuildRequires:	globus-gass-cache-devel%{?_isa} >= 8
-BuildRequires:	globus-gass-transfer-devel%{?_isa} >= 7
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-gsi-credential-devel >= 5
+BuildRequires:	globus-scheduler-event-generator-devel >= 4
+BuildRequires:	globus-xio-popen-driver-devel >= 2
+BuildRequires:	globus-xio-devel >= 3
+BuildRequires:	globus-gss-assist-devel >= 8
+BuildRequires:	globus-callout-devel >= 2
+BuildRequires:	globus-gram-job-manager-callout-error-devel >= 2
+BuildRequires:	globus-gssapi-gsi-devel >= 10
+BuildRequires:	globus-gram-protocol-devel >= 11
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-gsi-sysconfig-devel >= 5
+BuildRequires:	globus-usage-devel >= 3
+BuildRequires:	globus-rsl-devel >= 9
+BuildRequires:	globus-gass-cache-devel >= 8
+BuildRequires:	globus-gass-transfer-devel >= 7
 BuildRequires:	globus-common-progs >= 14
 BuildRequires:	globus-gram-protocol-doc >= 11
 BuildRequires:	globus-common-doc >= 14
@@ -129,7 +131,7 @@ unset GPT_LOCATION
 aclocal_includes="-I ." %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --with-flavor=%{flavor} \
-	   --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+	   --enable-doxygen --with-docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -177,7 +179,7 @@ rm $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_%{flavor}_dev.gpt
 
 # Install README file
-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
@@ -189,6 +191,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -200,13 +205,16 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 %dir %{_localstatedir}/lib/globus/gram_job_state
 %dir %{_localstatedir}/log/globus
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %files -f package-doc.filelist doc
-%dir %{_docdir}/%{name}-%{version}/html
+%dir %{_pkgdocdir}/html
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 13.51-4
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 13.51-3
 - Add aarch64 to the list of 64 bit platforms