[globus-gss-assist/f19: 2/2] Implement updated packaging guidelines

[Mattias Ellert]

commit c764616032b5441e0006046f41d7973b395d91c6
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 06:59:57 2013 +0200

    Implement updated packaging guidelines

 globus-gss-assist.spec |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/globus-gss-assist.spec b/globus-gss-assist.spec
index 59dbafb..426e82f 100644
--- a/globus-gss-assist.spec
+++ b/globus-gss-assist.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gss-assist
 %global _name %(tr - _ <<< %{name})
 Version:	8.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - GSSAPI Assist library
 
 Group:		System Environment/Libraries
@@ -27,12 +29,12 @@ Requires:	globus-common%{?_isa} >= 14
 Requires:	globus-callout%{?_isa} >= 2
 Requires:	globus-gssapi-gsi%{?_isa} >= 9
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-gsi-cert-utils-devel%{?_isa} >= 8
-BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 5
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-callout-devel%{?_isa} >= 2
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 9
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-gsi-cert-utils-devel >= 8
+BuildRequires:	globus-gsi-sysconfig-devel >= 5
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-callout-devel >= 2
+BuildRequires:	globus-gssapi-gsi-devel >= 9
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -140,7 +142,7 @@ unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
 %configure --disable-static --with-flavor=%{flavor} \
-	   --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+	   --enable-doxygen --with-docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -172,7 +174,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}/%{flavor}_rtl.filelist \
@@ -184,23 +186,29 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f package.filelist
 %dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %files -f package-progs.filelist progs
 
 %files -f package-devel.filelist devel
 
 %files -f package-doc.filelist doc
-%dir %{_docdir}/%{name}-%{version}/html
+%dir %{_pkgdocdir}/html
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.7-4
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 8.7-3
 - Perl 5.18 rebuild