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

[Mattias Ellert]

commit 2f143c9643cdcdecdb4ae7dab29c8ed676027277
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 09:03:36 2013 +0200

    Implement updated packaging guidelines

 globus-gram-job-manager-pbs.spec |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/globus-gram-job-manager-pbs.spec b/globus-gram-job-manager-pbs.spec
index fb18966..6ec471f 100644
--- a/globus-gram-job-manager-pbs.spec
+++ b/globus-gram-job-manager-pbs.spec
@@ -12,10 +12,12 @@
 %global pbs_log_path /var/torque/server_logs
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gram-job-manager-pbs
 %global _name %(tr - _ <<< %{name})
 Version:	1.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - PBS Job Manager Support
 
 Group:		Applications/Internet
@@ -39,9 +41,9 @@ Provides:	globus-gram-job-manager-setup-pbs = 4.5
 Obsoletes:	globus-gram-job-manager-setup-pbs < 4.5
 Obsoletes:	globus-gram-job-manager-setup-pbs-doc < 4.5
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-scheduler-event-generator-devel%{?_isa} >= 4
-BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-scheduler-event-generator-devel >= 4
+BuildRequires:	globus-common-devel >= 14
 
 %package setup-poll
 Summary:	Globus Toolkit - PBS Job Manager Support using polling
@@ -118,7 +120,7 @@ export QDEL=/usr/bin/qdel-torque
 export QSTAT=/usr/bin/qstat-torque
 export QSUB=/usr/bin/qsub-torque
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version} \
+	   --with-docdir=%{_pkgdocdir} \
 	   --with-globus-state-dir=%{_localstatedir}/lib/globus \
 	   --with-log-path=%{pbs_log_path}
 
@@ -148,7 +150,7 @@ sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 rm %{buildroot}/etc/grid-services/jobmanager-pbs
 
 # 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_pbs.so
@@ -168,6 +170,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-pbs-poll > /dev/null 2>&1 || :
@@ -193,8 +198,8 @@ fi
 %{perl_vendorlib}/Globus
 %config(noreplace) %{_sysconfdir}/globus/globus-pbs.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-pbs-poll
@@ -204,6 +209,9 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/pbs
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.6-5
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.6-4
 - Perl 5.18 rebuild