[globus-simple-ca/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit cab4ef074228f99c4382df6a8e1994dc1b557006
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 09:22:46 2013 +0200

    Implement updated packaging guidelines

 globus-simple-ca.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/globus-simple-ca.spec b/globus-simple-ca.spec
index b582474..5f29f95 100644
--- a/globus-simple-ca.spec
+++ b/globus-simple-ca.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-simple-ca
 %global _name %(tr - _ <<< %{name})
 Version:	3.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Simple CA Utility
 
 Group:		Applications/Internet
@@ -47,7 +49,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}
 
@@ -58,7 +60,7 @@ make install DESTDIR=%{buildroot}
 GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 
 # 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 \
@@ -67,13 +69,19 @@ 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/simple-ca
 %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> - 3.2-4
+- Implement updated packaging guidelines
+
 * Thu May 23 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.2-3
 - Don't use \t in echo