[globus-gass-cache-program/f19: 2/2] Implement updated packaging guidelines

[Mattias Ellert]

commit 139737b6081a6381a2541c80fa45370faa7a85e4
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:45:25 2013 +0200

    Implement updated packaging guidelines

 globus-gass-cache-program.spec |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/globus-gass-cache-program.spec b/globus-gass-cache-program.spec
index 5f8e9a2..77c5a0f 100644
--- a/globus-gass-cache-program.spec
+++ b/globus-gass-cache-program.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gass-cache-program
 %global _name %(tr - _ <<< %{name})
 Version:	5.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches
 
 Group:		Applications/Internet
@@ -25,13 +27,13 @@ Requires:	globus-gass-copy%{?_isa} >= 8
 Requires:	globus-gass-cache%{?_isa} >= 8
 Requires:	globus-gass-transfer%{?_isa} >= 7
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-gram-client-devel%{?_isa} >= 12
-BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 4
-BuildRequires:	globus-gass-copy-devel%{?_isa} >= 8
-BuildRequires:	globus-gass-cache-devel%{?_isa} >= 8
-BuildRequires:	globus-gass-transfer-devel%{?_isa} >= 7
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-gram-client-devel >= 12
+BuildRequires:	globus-gass-server-ez-devel >= 4
+BuildRequires:	globus-gass-copy-devel >= 8
+BuildRequires:	globus-gass-cache-devel >= 8
+BuildRequires:	globus-gass-transfer-devel >= 7
 
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
@@ -58,7 +60,7 @@ unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_docdir}/%{name}-%{version}
+	   --with-docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -72,7 +74,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}/%{flavor}_pgm.filelist \
@@ -80,12 +82,18 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_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/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> - 5.2-6
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 5.2-5
 - Perl 5.18 rebuild