[globus-gsi-cert-utils/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit fbdcc590ec7de213c09e13e478a11402b1b78a25
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 05:40:23 2013 +0200

    Implement updated packaging guidelines

 globus-gsi-cert-utils-doxygen.patch |   12 ++++++++++++
 globus-gsi-cert-utils.spec          |   34 ++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 12 deletions(-)
---
diff --git a/globus-gsi-cert-utils-doxygen.patch b/globus-gsi-cert-utils-doxygen.patch
new file mode 100644
index 0000000..9f87971
--- /dev/null
+++ b/globus-gsi-cert-utils-doxygen.patch
@@ -0,0 +1,12 @@
+diff -ur globus_gsi_cert_utils-8.3.orig/library/globus_gsi_cert_utils.c globus_gsi_cert_utils-8.3/library/globus_gsi_cert_utils.c
+--- globus_gsi_cert_utils-8.3.orig/library/globus_gsi_cert_utils.c	2011-01-28 03:21:23.000000000 +0100
++++ globus_gsi_cert_utils-8.3/library/globus_gsi_cert_utils.c	2013-07-28 05:35:34.727503477 +0200
+@@ -887,7 +887,7 @@
+  *
+  * @param cert_chain
+  *    Certificate chain to inspect.
+- * @param eec
++ * @param identity_cert
+  *    Pointer to be set to the certificate value from within the cert chain.
+  *    Must freed by the caller.
+  */
diff --git a/globus-gsi-cert-utils.spec b/globus-gsi-cert-utils.spec
index 28632df..4745849 100644
--- a/globus-gsi-cert-utils.spec
+++ b/globus-gsi-cert-utils.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gsi-cert-utils
 %global _name %(tr - _ <<< %{name})
 Version:	8.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - Globus GSI Cert Utils Library
 
 Group:		System Environment/Libraries
@@ -20,6 +22,7 @@ Source8:	GLOBUS-GSIC
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
 Patch0:		%{name}-ac.patch
+Patch1:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-gsi-proxy-ssl%{?_isa} >= 4
@@ -27,12 +30,12 @@ Requires:	globus-common%{?_isa} >= 14
 Requires:	globus-openssl-module%{?_isa} >= 3
 Requires:	globus-gsi-openssl-error%{?_isa} >= 2
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-gsi-proxy-ssl-devel%{?_isa} >= 4
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	globus-openssl-module-devel%{?_isa} >= 3
-BuildRequires:	globus-gsi-openssl-error-devel%{?_isa} >= 2
-BuildRequires:	openssl-devel%{?_isa}
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-gsi-proxy-ssl-devel >= 4
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-openssl-module-devel >= 3
+BuildRequires:	globus-gsi-openssl-error-devel >= 2
+BuildRequires:	openssl-devel
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -119,6 +122,7 @@ Globus GSI Cert Utils Library Documentation Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -142,7 +146,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
@@ -174,7 +178,7 @@ grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 sed /GLOBUS_LICENSE/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 \
@@ -186,23 +190,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.3-6
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.3-5
 - Add aarch64 to the list of 64 bit platforms
 - Don't use AM_CONFIG_HEADER (automake 1.13)