[globus-gfork/el5: 10/10] Update to Globus Toolkit 6.0

[Mattias Ellert]

commit 94626ffc32d4c1dc1b66597be8dd4ab90ef5f0f0
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 18 12:14:09 2014 +0200

    Update to Globus Toolkit 6.0
    
    - Drop GPT build system and GPT packaging metadata

 globus-gfork.spec |   76 ++++++++++++++++++----------------------------------
 sources           |    2 +-
 2 files changed, 27 insertions(+), 51 deletions(-)
---
diff --git a/globus-gfork.spec b/globus-gfork.spec
index 9fe7805..2b19eab 100644
--- a/globus-gfork.spec
+++ b/globus-gfork.spec
@@ -1,30 +1,20 @@
-%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
-
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		globus-gfork
 %global _name %(tr - _ <<< %{name})
-Version:	3.2
-Release:	10%{?dist}
+Version:	4.6
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GFork
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRIDFTP
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-common%{?_isa} >= 14
-Requires:	globus-xio%{?_isa} >= 3
-BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core >= 8
-BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-common-devel >= 15
 BuildRequires:	globus-xio-devel >= 3
 
 %package progs
@@ -36,7 +26,7 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Summary:	Globus Toolkit - GFork Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-common-devel%{?_isa} >= 15
 Requires:	globus-xio-devel%{?_isa} >= 3
 
 %description
@@ -73,19 +63,13 @@ GFork Development Files
 %setup -q -n %{_name}-%{version}
 
 %build
-# Remove files that should be replaced during bootstrap
-rm -f doxygen/Doxyfile*
-rm -f doxygen/Makefile.am
-rm -f pkgdata/Makefile.am
-rm -f globus_automake*
-rm -rf autom4te.cache
-
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
 
-%configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_pkgdocdir}
+%configure --disable-static \
+	   --includedir='${prefix}/include/globus' \
+	   --libexecdir='${datadir}/globus' \
+	   --docdir=%{_pkgdocdir}
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -96,11 +80,8 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
 # Remove libtool archives (.la files)
-find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
+rm %{buildroot}%{_libdir}/*.la
 
 # Install README file
 install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
@@ -110,20 +91,6 @@ mkdir -p %{buildroot}%{_sysconfdir}
 echo "# This is the default gfork configuration file" > \
   %{buildroot}%{_sysconfdir}/gfork.conf
 
-# Remove README.txt from main package
-rm %{buildroot}%{_pkgdocdir}/README.txt
-sed '/README.txt/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
-  | sed s!^!%{_prefix}! > package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
-  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
-  | sed s!^!%{_prefix}! > package-progs.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
-  | sed s!^!%{_prefix}! > package-devel.filelist
-
 %clean
 rm -rf %{buildroot}
 
@@ -131,18 +98,27 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gfork.so.*
 %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
 
-%files -f package-progs.filelist progs
+%files progs
+%{_sbindir}/gfork
 %config(noreplace) %{_sysconfdir}/gfork.conf
-%doc README.txt
+%doc %{_pkgdocdir}/README.txt
 
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gfork.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.6-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 858abbd..37e98fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-010d6bf55510766f41d124df6e296e98  globus_gfork-3.2.tar.gz
+22d21f63f38cbd887850a5d238ae2f60  globus_gfork-4.6.tar.gz