[globus-scheduler-event-generator/f19] Implement updated packaging guidelines

[Mattias Ellert]

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

    Implement updated packaging guidelines

 globus-scheduler-event-generator.spec |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/globus-scheduler-event-generator.spec b/globus-scheduler-event-generator.spec
index 205c0cd..d2f2c61 100644
--- a/globus-scheduler-event-generator.spec
+++ b/globus-scheduler-event-generator.spec
@@ -6,10 +6,12 @@
 
 %{!?_initddir: %global _initddir %{_initrddir}}
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-scheduler-event-generator
 %global _name %(tr - _ <<< %{name})
 Version:	4.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Scheduler Event Generator
 
 Group:		System Environment/Libraries
@@ -27,13 +29,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	globus-common%{?_isa} >= 14
 Requires:	globus-xio-gsi-driver%{?_isa} >= 2
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 11
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-xio-gsi-driver-devel%{?_isa} >= 2
-BuildRequires:	globus-xio-devel%{?_isa} >= 3
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-gram-protocol-devel >= 11
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-xio-gsi-driver-devel >= 2
+BuildRequires:	globus-xio-devel >= 3
 %if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
-BuildRequires:	libtool-ltdl-devel%{?_isa}
+BuildRequires:	libtool-ltdl-devel
 %else
 BuildRequires:	libtool
 %endif
@@ -150,7 +152,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} \
 	   --with-initscript-config-path=%{_sysconfdir}/sysconfig/%{name} \
 	   --with-lockfile-path='${localstatedir}/lock/subsys/%{name}'
 
@@ -187,7 +189,7 @@ mkdir -p %{buildroot}%{_initddir}
 install -p %{SOURCE1} %{buildroot}%{_initddir}
 
 # 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 \
@@ -202,6 +204,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
@@ -224,8 +229,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
 %{_initddir}/%{name}
@@ -233,9 +238,12 @@ fi
 %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> - 4.7-4
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.7-3
 - Add aarch64 to the list of 64 bit platforms