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

[Mattias Ellert]

commit 1fd85f49a8aed0c84c54887f20adcdc8fce80a21
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:59:37 2013 +0200

    Implement updated packaging guidelines

 globus-gram-job-manager-fork.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/globus-gram-job-manager-fork.spec b/globus-gram-job-manager-fork.spec
index f1b9ffe..bba7f9e 100644
--- a/globus-gram-job-manager-fork.spec
+++ b/globus-gram-job-manager-fork.spec
@@ -6,10 +6,12 @@
 
 %{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gram-job-manager-fork
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - Fork Job Manager Support
 
 Group:		Applications/Internet
@@ -31,11 +33,11 @@ Provides:	globus-gram-job-manager-setup-fork = 4.3
 Obsoletes:	globus-gram-job-manager-setup-fork < 4.3
 Obsoletes:	globus-gram-job-manager-setup-fork-doc < 4.3
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 11
-BuildRequires:	globus-scheduler-event-generator-devel%{?_isa} >= 4
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-xio-devel%{?_isa} >= 3
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-gram-protocol-devel >= 11
+BuildRequires:	globus-scheduler-event-generator-devel >= 4
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-xio-devel >= 3
 
 %package setup-poll
 Summary:	Globus Toolkit - Fork Job Manager Support using polling
@@ -110,7 +112,7 @@ unset GPT_LOCATION
 export MPIEXEC=no
 export MPIRUN=no
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version} \
+	   --with-docdir=%{_pkgdocdir} \
 	   --with-globus-state-dir=%{_localstatedir}/lib/globus
 
 # Reduce overlinking
@@ -144,7 +146,7 @@ grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Install README file
-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
 # Devel package is redundant
 rm %{buildroot}%{_libdir}/libglobus_seg_fork.so
@@ -164,6 +166,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed 's!^!%doc %{_prefix}!' > package.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %preun setup-poll
 if [ $1 -eq 0 ]; then
     globus-gatekeeper-admin -d jobmanager-fork-poll > /dev/null 2>&1 || :
@@ -188,8 +193,8 @@ fi
 %{perl_vendorlib}/Globus
 %config(noreplace) %{_sysconfdir}/globus/globus-fork.conf
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %files setup-poll
 %config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-fork-poll
@@ -199,6 +204,9 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/fork
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-6
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.5-5
 - Perl 5.18 rebuild