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

[Mattias Ellert]

commit 1ff50e47317f25fc4d730840c08f776e0e31b125
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 05:07:27 2013 +0200

    Implement updated packaging guidelines

 globus-common.spec |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/globus-common.spec b/globus-common.spec
index f6aa38f..89c8748 100644
--- a/globus-common.spec
+++ b/globus-common.spec
@@ -6,10 +6,12 @@
 
 %{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	14.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -44,9 +46,9 @@ Provides:	globus-libxml2 = 2
 Provides:	globus-libxml2%{?_isa} = 2
 Obsoletes:	globus-libxml2 < 2
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-core >= 8
 %if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
-BuildRequires:	libtool-ltdl-devel%{?_isa}
+BuildRequires:	libtool-ltdl-devel
 %else
 BuildRequires:	libtool
 %endif
@@ -190,7 +192,7 @@ unset GPT_LOCATION
 
 export GLOBUS_VERSION=5.2.3
 %configure --disable-static --with-flavor=%{flavor} \
-	   --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version} \
+	   --enable-doxygen --with-docdir=%{_pkgdocdir} \
 	   --with-backward-compatibility-hack
 
 # Reduce overlinking
@@ -252,7 +254,7 @@ rm -f %{buildroot}%{_mandir}/man3/deprecated.3
 sed -e '/deprecated\.3/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 \
@@ -264,6 +266,9 @@ 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
@@ -274,8 +279,8 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/Core
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
 
 %files -f package-progs.filelist progs
 
@@ -283,9 +288,12 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 %dir %{_includedir}/globus
 
 %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> - 14.9-5
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 14.9-4
 - Perl 5.18 rebuild