[globus-io/el5] GT6 update

[Mattias Ellert]

commit 937e6b6a72c5ed5f7d531f691af00aaf81f45d37
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Oct 27 21:28:35 2014 +0100

    GT6 update
    
    - Drop patch globus-io-doxygen.patch (obsolete)
    - Remove documentation package again (upstream changed their minds)

 globus-io-doxygen.patch |   67 -----------------------------------------------
 globus-io.spec          |   39 ++++++---------------------
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 98 deletions(-)
---
diff --git a/globus-io.spec b/globus-io.spec
index 4cc0fb3..e4f0546 100644
--- a/globus-io.spec
+++ b/globus-io.spec
@@ -2,7 +2,7 @@
 
 Name:		globus-io
 %global _name %(tr - _ <<< %{name})
-Version:	10.11
+Version:	10.12
 Release:	1%{?dist}
 Summary:	Globus Toolkit - uniform I/O interface
 
@@ -12,20 +12,18 @@ URL:		http://www.globus.org/
 Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-XIO
-#		Doxygen fixes
-Patch0:		%{name}-doxygen.patch
 #		Run tests on localhost interface
-Patch1:		%{name}-tests-localhost.patch
+Patch0:		%{name}-tests-localhost.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-xio-gsi-driver%{?_isa} >= 2
+Obsoletes:	%{name}-doc < 10.12
 BuildRequires:	globus-common-devel >= 15
 BuildRequires:	globus-xio-devel >= 3
 BuildRequires:	globus-gss-assist-devel >= 8
 BuildRequires:	globus-gssapi-gsi-devel >= 10
 BuildRequires:	globus-xio-gsi-driver-devel >= 2
 BuildRequires:	globus-gssapi-error-devel >= 4
-BuildRequires:	doxygen
 #		Additional requirements for make check
 BuildRequires:	openssl
 BuildRequires:	perl(Test::More)
@@ -41,13 +39,6 @@ Requires:	globus-gssapi-gsi-devel%{?_isa} >= 10
 Requires:	globus-xio-gsi-driver-devel%{?_isa} >= 2
 Requires:	globus-gssapi-error-devel%{?_isa} >= 4
 
-%package doc
-Summary:	Globus Toolkit - uniform I/O interface Documentation Files
-Group:		Documentation
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildArch:	noarch
-%endif
-
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
 systems and applications. It is being developed by the Globus Alliance and
@@ -66,19 +57,9 @@ using the Globus Toolkit to unlock the potential of grids for their cause.
 The %{name}-devel package contains:
 uniform I/O interface Development Files
 
-%description doc
-The Globus Toolkit is an open source software toolkit used for building Grid
-systems and applications. It is being developed by the Globus Alliance and
-many others all over the world. A growing number of projects and companies are
-using the Globus Toolkit to unlock the potential of grids for their cause.
-
-The %{name}-doc package contains:
-uniform I/O interface Documentation Files
-
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 # Reduce overlinking
@@ -105,7 +86,7 @@ rm %{buildroot}%{_libdir}/*.la
 install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
 %check
-make check
+make %{?_smp_mflags} check
 
 %clean
 rm -rf %{buildroot}
@@ -125,14 +106,12 @@ rm -rf %{buildroot}
 %{_libdir}/libglobus_io.so
 %{_libdir}/pkgconfig/%{name}.pc
 
-%files doc
-%doc %{_mandir}/man3/*
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/GLOBUS_LICENSE
-%dir %{_pkgdocdir}/html
-%doc %{_pkgdocdir}/html/*
-
 %changelog
+* Mon Oct 27 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.12-1
+- GT6 update
+- Drop patch globus-io-doxygen.patch (obsolete)
+- Remove documentation package again (upstream changed their minds)
+
 * Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.11-1
 - Update to Globus Toolkit 6.0
 - Drop GPT build system and GPT packaging metadata
diff --git a/sources b/sources
index be65a87..bcb0727 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31eacf6cb9bc9cad6641c25f77564afd  globus_io-10.11.tar.gz
+638843f8d734ab0cb8ee41054e9537e0  globus_io-10.12.tar.gz