[globus-gatekeeper/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit 9355e8e3f14e1c7895a9992443eb7b57b7111c3c
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:49:56 2013 +0200

    Implement updated packaging guidelines

 globus-gatekeeper.spec |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/globus-gatekeeper.spec b/globus-gatekeeper.spec
index c7f1a98..47e6879 100644
--- a/globus-gatekeeper.spec
+++ b/globus-gatekeeper.spec
@@ -6,10 +6,12 @@
 
 %{!?_initddir: %global _initddir %{_initrddir}}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gatekeeper
 %global _name %(tr - _ <<< %{name})
 Version:	9.14
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Globus Gatekeeper
 
 Group:		Applications/Internet
@@ -33,11 +35,11 @@ Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-gss-assist-devel%{?_isa} >= 8
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 9
-BuildRequires:	openssl-devel%{?_isa}
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-gss-assist-devel >= 8
+BuildRequires:	globus-gssapi-gsi-devel >= 9
+BuildRequires:	openssl-devel
 
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
@@ -65,7 +67,7 @@ unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version} \
+	   --with-docdir=%{_pkgdocdir} \
 	   --with-initscript-config-path=/etc/sysconfig/globus-gatekeeper \
 	   --with-lockfile-path='${localstatedir}/lock/subsys/globus-gatekeeper'
 
@@ -90,10 +92,10 @@ install -p %{SOURCE1} %{buildroot}%{_initrddir}
 
 # Install post installation instructions
 install -m 644 -p %{SOURCE2} \
-  %{buildroot}%{_docdir}/%{name}-%{version}/README.Fedora
+  %{buildroot}%{_pkgdocdir}/README.Fedora
 
 # 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}/%{flavor}_pgm.filelist \
@@ -107,6 +109,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 mkdir -p %{buildroot}/etc/grid-services
 mkdir -p %{buildroot}/etc/grid-services/available
 
+%clean
+rm -rf %{buildroot}
+
 %post
 if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add %{name}
@@ -128,11 +133,14 @@ fi
 %dir %{_sysconfdir}/grid-services
 %dir %{_sysconfdir}/grid-services/available
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/README.Fedora
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/README.Fedora
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.14-5
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.14-4
 - Add aarch64 to the list of 64 bit platforms
 - Don't use AM_CONFIG_HEADER (automake 1.13)