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

[Mattias Ellert]

commit c1cad3e2df8060dcf140ee12f1c45256dd4aed1a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 09:01:40 2013 +0200

    Implement updated packaging guidelines

 globus-gram-job-manager-condor.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/globus-gram-job-manager-condor.spec b/globus-gram-job-manager-condor.spec
index 8d61f60..08fea55 100644
--- a/globus-gram-job-manager-condor.spec
+++ b/globus-gram-job-manager-condor.spec
@@ -1,9 +1,11 @@
 %{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gram-job-manager-condor
 %global _name %(tr - _ <<< %{name})
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Condor Job Manager Support
 
 Group:		Applications/Internet
@@ -56,7 +58,7 @@ unset GPT_LOCATION
 export CONDOR_RM=/usr/bin/condor_rm
 export CONDOR_SUBMIT=/usr/bin/condor_submit
 %configure --disable-static --without-flavor \
-	   --with-docdir=%{_docdir}/%{name}-%{version} \
+	   --with-docdir=%{_pkgdocdir} \
 	   --with-globus-state-dir=%{_localstatedir}/lib/globus
 
 make %{?_smp_mflags}
@@ -71,7 +73,7 @@ GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 rm %{buildroot}/etc/grid-services/jobmanager-condor
 
 # Install README file
-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
 # List config files in each package - drop the file list
 rm $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
@@ -83,6 +85,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %preun
 if [ $1 -eq 0 ]; then
     globus-gatekeeper-admin -d jobmanager-condor > /dev/null 2>&1 || :
@@ -96,10 +101,13 @@ fi
 %config(noreplace) %{_sysconfdir}/globus/globus-condor.conf
 %config(noreplace) %{_sysconfdir}/grid-services/available/jobmanager-condor
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.4-5
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.4-4
 - Perl 5.18 rebuild