[globus-gssapi-gsi/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit 494cc182dcee155577ba68525d874e2c8838a4d7
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 06:31:39 2013 +0200

    Implement updated packaging guidelines

 globus-gssapi-gsi-doxygen.patch |   23 +++++++++++++++++++++
 globus-gssapi-gsi.spec          |   42 ++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 16 deletions(-)
---
diff --git a/globus-gssapi-gsi-doxygen.patch b/globus-gssapi-gsi-doxygen.patch
new file mode 100644
index 0000000..965570b
--- /dev/null
+++ b/globus-gssapi-gsi-doxygen.patch
@@ -0,0 +1,23 @@
+diff -ur globus_gssapi_gsi-10.7.orig/library/gssapi.h globus_gssapi_gsi-10.7/library/gssapi.h
+--- globus_gssapi_gsi-10.7.orig/library/gssapi.h	2011-09-22 15:16:06.000000000 +0200
++++ globus_gssapi_gsi-10.7/library/gssapi.h	2013-07-28 06:09:21.822465215 +0200
+@@ -276,6 +276,7 @@
+  * Set if you want to allow CA certs without a signing policy to verify.
+  */
+ #define GSS_C_GLOBUS_ALLOW_MISSING_SIGNING_POLICY 65536
++/* @} */
+ 
+ /**
+  * @ingroup globus_gsi_gss_requested_context_flags
+diff -ur globus_gssapi_gsi-10.7.orig/library/verify_mic.c globus_gssapi_gsi-10.7/library/verify_mic.c
+--- globus_gssapi_gsi-10.7.orig/library/verify_mic.c	2010-02-19 22:23:03.000000000 +0100
++++ globus_gssapi_gsi-10.7/library/verify_mic.c	2013-07-28 06:10:41.361141964 +0200
+@@ -313,7 +313,7 @@
+  *
+  * @param minor_status
+  * @param context_handle
+- * @param massage_buffer
++ * @param message_buffer
+  * @param token_buffer
+  * @param qop_state
+  * 
diff --git a/globus-gssapi-gsi.spec b/globus-gssapi-gsi.spec
index a2a2dba..4716487 100644
--- a/globus-gssapi-gsi.spec
+++ b/globus-gssapi-gsi.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-gssapi-gsi
 %global _name %(tr - _ <<< %{name})
 Version:	10.7
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - GSSAPI library
 
 Group:		System Environment/Libraries
@@ -19,6 +21,7 @@ Source8:	GLOBUS-GSIC
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
+Patch0:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-gsi-credential%{?_isa} >= 5
@@ -30,16 +33,16 @@ Requires:	globus-gsi-cert-utils%{?_isa} >= 8
 Requires:	globus-gsi-sysconfig%{?_isa} >= 5
 Requires:	globus-common%{?_isa} >= 14
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-gsi-credential-devel%{?_isa} >= 5
-BuildRequires:	globus-gsi-callback-devel%{?_isa} >= 4
-BuildRequires:	globus-openssl-module-devel%{?_isa} >= 3
-BuildRequires:	globus-gsi-openssl-error-devel%{?_isa} >= 2
-BuildRequires:	globus-gsi-proxy-core-devel%{?_isa} >= 6
-BuildRequires:	globus-gsi-cert-utils-devel%{?_isa} >= 8
-BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 5
-BuildRequires:	globus-common-devel%{?_isa} >= 14
-BuildRequires:	openssl-devel%{?_isa}
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-gsi-credential-devel >= 5
+BuildRequires:	globus-gsi-callback-devel >= 4
+BuildRequires:	globus-openssl-module-devel >= 3
+BuildRequires:	globus-gsi-openssl-error-devel >= 2
+BuildRequires:	globus-gsi-proxy-core-devel >= 6
+BuildRequires:	globus-gsi-cert-utils-devel >= 8
+BuildRequires:	globus-gsi-sysconfig-devel >= 5
+BuildRequires:	globus-common-devel >= 14
+BuildRequires:	openssl-devel
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -113,6 +116,7 @@ GSSAPI library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -136,7 +140,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
@@ -167,7 +171,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 \
@@ -177,21 +181,27 @@ 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-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> - 10.7-5
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.7-4
 - Add aarch64 to the list of 64 bit platforms