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

[Mattias Ellert]

commit c98b86d0a577675d7262e5babe08da37dd316f17
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:54:14 2013 +0200

    Implement updated packaging guidelines

 globus-gram-job-manager-scripts.spec |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/globus-gram-job-manager-scripts.spec b/globus-gram-job-manager-scripts.spec
index 92df728..2949a19 100644
--- a/globus-gram-job-manager-scripts.spec
+++ b/globus-gram-job-manager-scripts.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-scripts
 %global _name %(tr - _ <<< %{name})
 Version:	4.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Globus Toolkit - GRAM Job ManagerScripts
 
 Group:		Applications/Internet
@@ -59,7 +61,7 @@ unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --without-flavor \
-	   --with-docdir=%{_docdir}/%{name}-%{version}
+	   --with-docdir=%{_pkgdocdir}
 
 make %{?_smp_mflags}
 
@@ -80,7 +82,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
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist \
@@ -89,19 +91,25 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %files -f package.filelist
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/GRAM
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %files doc -f package-doc.filelist
-%dir %{_docdir}/%{name}-%{version}/perl
-%dir %{_docdir}/%{name}-%{version}/perl/Globus
-%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
+%dir %{_pkgdocdir}/perl
+%dir %{_pkgdocdir}/perl/Globus
+%dir %{_pkgdocdir}/perl/Globus/GRAM
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.2-9
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 4.2-8
 - Perl 5.18 rebuild