[globus-xio/f19] Implement updated packaging guidelines

[Mattias Ellert]

commit e895bb00a8b0befc16d12b44c35956ba493e4b3f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jul 28 07:44:45 2013 +0200

    Implement updated packaging guidelines

 globus-xio-doxygen.patch |   23 +++++++++++++++++++++++
 globus-xio.spec          |   26 ++++++++++++++++++--------
 2 files changed, 41 insertions(+), 8 deletions(-)
---
diff --git a/globus-xio-doxygen.patch b/globus-xio-doxygen.patch
new file mode 100644
index 0000000..c08a6ce
--- /dev/null
+++ b/globus-xio-doxygen.patch
@@ -0,0 +1,23 @@
+diff -ur globus_xio-3.3.orig/globus_xio_driver.h globus_xio-3.3/globus_xio_driver.h
+--- globus_xio-3.3.orig/globus_xio_driver.h	2011-02-03 22:53:09.000000000 +0100
++++ globus_xio-3.3/globus_xio_driver.h	2013-07-28 07:39:06.288804630 +0200
+@@ -1379,7 +1379,7 @@
+  *  all at runtime with no object module references.  For example, a TCP driver
+  *  can be loaded with the string: tcp, and the options can be set with:
+  *
+- *  port=50668#keepalive=yes#nodelay=N
++ *  port=50668\#keepalive=yes\#nodelay=N
+  *
+  *  this would set the port to 50668, keepalive to true and nodelay to false.
+  *  The particular string definition is defined by the tcp driver by properly 
+diff -ur globus_xio-3.3.orig/globus_xio_types.h globus_xio-3.3/globus_xio_types.h
+--- globus_xio-3.3.orig/globus_xio_types.h	2011-02-03 22:53:09.000000000 +0100
++++ globus_xio-3.3/globus_xio_types.h	2013-07-28 07:38:26.726454960 +0200
+@@ -189,6 +189,7 @@
+      * @param config_string
+      *      The driver specific parameter string.
+      */
++    /* char *                           config_string */
+     GLOBUS_XIO_SET_STRING_OPTIONS
+     
+ } globus_xio_handle_cmd_t;
diff --git a/globus-xio.spec b/globus-xio.spec
index 2f8c098..bbdbae5 100644
--- a/globus-xio.spec
+++ b/globus-xio.spec
@@ -4,10 +4,12 @@
 %global flavor gcc32
 %endif
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -20,12 +22,13 @@ Source8:	GLOBUS-XIO
 #		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-common%{?_isa} >= 14
 BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core%{?_isa} >= 8
-BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-core >= 8
+BuildRequires:	globus-common-devel >= 14
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -92,6 +95,7 @@ Globus XIO Framework Documentation Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -115,7 +119,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
@@ -148,7 +152,7 @@ for f in %{buildroot}%{_mandir}/man3/globus_xio_driver.3 \
 done
 
 # 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 \
@@ -158,21 +162,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> - 3.3-6
+- Implement updated packaging guidelines
+
 * Tue May 21 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.3-5
 - Add aarch64 to the list of 64 bit platforms
 - Don't use AM_CONFIG_HEADER (automake 1.13)