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

[Mattias Ellert]

commit e32ada60a7715c914d126e510d574ab70eb4b3f9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 08:33:08 2013 +0200

    Implement updated packaging guidelines

 globus-gridftp-server.spec |   38 +++++++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index 1dbeef9..29827cf 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -6,10 +6,12 @@
 
 %{!?_initddir: %global _initddir %{_initrddir}}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gridftp-server
 %global _name %(tr - _ <<< %{name})
 Version:	6.19
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus GridFTP Server
 
 Group:		System Environment/Libraries
@@ -34,16 +36,16 @@ Requires:	globus-common%{?_isa} >= 14
 Requires:	globus-xio-gsi-driver%{?_isa} >= 2
 Requires:	globus-usage%{?_isa} >= 3
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-xio-devel%{?_isa} >= 3
-BuildRequires:	globus-authz-devel%{?_isa} >= 2
-BuildRequires:	globus-gfork-devel%{?_isa} >= 3
-BuildRequires:	globus-ftp-control-devel%{?_isa} >= 4
-BuildRequires:	globus-gridftp-server-control-devel%{?_isa} >= 2
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-xio-gsi-driver-devel%{?_isa} >= 2
-BuildRequires:	globus-usage-devel%{?_isa} >= 3
-BuildRequires:	openssl-devel%{?_isa}
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-xio-devel >= 3
+BuildRequires:	globus-authz-devel >= 2
+BuildRequires:	globus-gfork-devel >= 3
+BuildRequires:	globus-ftp-control-devel >= 4
+BuildRequires:	globus-gridftp-server-control-devel >= 2
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-xio-gsi-driver-devel >= 2
+BuildRequires:	globus-usage-devel >= 3
+BuildRequires:	openssl-devel
 
 %package progs
 Summary:	Globus Toolkit - Globus GridFTP Server Programs
@@ -114,7 +116,7 @@ unset GPT_LOCATION
 
 export GRIDMAP=/etc/grid-security/grid-mapfile
 %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
@@ -162,7 +164,7 @@ sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 install -m 644 -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_mandir}/man8
 
 # 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 \
@@ -174,6 +176,9 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
+%clean
+rm -rf %{buildroot}
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -198,8 +203,8 @@ fi
 
 %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
 %config(noreplace) %{_sysconfdir}/gridftp.conf
@@ -213,6 +218,9 @@ fi
 %files -f package-devel.filelist devel
 
 %changelog
+* Sun Jul 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.19-4
+- Implement updated packaging guidelines
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 6.19-3
 - Perl 5.18 rebuild