[globus-gram-audit/f19: 2/2] Implement updated packaging guidelines

[Mattias Ellert]

commit f27a0bf995b8b001f6d35a9466b67ac6feb49404
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 09:20:21 2013 +0200

    Implement updated packaging guidelines

 globus-gram-audit.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/globus-gram-audit.spec b/globus-gram-audit.spec
index 7f2d204..f50d9cb 100644
--- a/globus-gram-audit.spec
+++ b/globus-gram-audit.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gram-audit
 %global _name %(tr - _ <<< %{name})
 Version:	3.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - GRAM Jobmanager Auditing
 
 Group:		Applications/Internet
@@ -43,7 +45,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}
 
@@ -60,7 +62,7 @@ sed s/globus-gram-audit.cron/globus-gram-audit/ \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.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 \
@@ -72,14 +74,20 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %files -f package.filelist
 %dir %{_datadir}/globus/gram-audit
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_localstatedir}/lib/globus/gram-audit
-%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> - 3.2-6
+- Implement updated packaging guidelines
+
 * Thu Jul 18 2013 Petr Pisar <ppisar at redhat.com> - 3.2-5
 - Perl 5.18 rebuild