[globus-gfork/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-gfork-deps.patch, globus-gfork-etc.patch, globus-

Mattias Ellert ellert at fedoraproject.org
Sun Jan 8 01:21:08 UTC 2012 

commit de896e805d2a562e3d70591a90812e79d706c1b7
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Jan 7 23:12:22 2012 +0100

    Update to Globus Toolkit 5.2.0
    Drop patches globus-gfork-deps.patch, globus-gfork-etc.patch,
    globus-gfork-opts.patch, globus-gfork.patch and globus-gfork-undefined.patch
    (fixed upstream)

 .gitignore                   |    2 +-
 GLOBUS-GRIDFTP               |    6 +++
 globus-gfork-deps.patch      |   39 ----------------
 globus-gfork-etc.patch       |   13 -----
 globus-gfork-funcgrp.patch   |   14 +++---
 globus-gfork-opts.patch      |   14 ------
 globus-gfork-undefined.patch |   13 -----
 globus-gfork.patch           |    9 ----
 globus-gfork.spec            |  100 ++++++++++++++---------------------------
 sources                      |    2 +-
 10 files changed, 49 insertions(+), 163 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5194a9..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-globus_gfork-0.2.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-GRIDFTP b/GLOBUS-GRIDFTP
index 99cac0a..9d3be67 100644
--- a/GLOBUS-GRIDFTP
+++ b/GLOBUS-GRIDFTP
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/
 Admin Guide:
 http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/admin/
 
+User's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/user/
+
 Developer's Guide:
 http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/developer/
 
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/qp/
 
 Migrating Guide:
 http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-gfork-funcgrp.patch b/globus-gfork-funcgrp.patch
index 971b7a3..ae66ad5 100644
--- a/globus-gfork-funcgrp.patch
+++ b/globus-gfork-funcgrp.patch
@@ -1,11 +1,11 @@
-diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
---- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 18:11:44.000000000 +0200
-+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2011-04-25 10:35:05.076486621 +0200
-@@ -5,6 +5,7 @@
- 
-     <Aging_Version Major="0" Minor="2" Age="0"/>
+diff -ur globus_gfork-3.1.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-3.1/pkgdata/pkg_data_src.gpt.in
+--- globus_gfork-3.1.orig/pkgdata/pkg_data_src.gpt.in	2011-10-25 15:27:39.000000000 +0200
++++ globus_gfork-3.1/pkgdata/pkg_data_src.gpt.in	2011-12-12 10:34:00.238286708 +0100
+@@ -3,6 +3,7 @@
+ <gpt_package_metadata Name="globus_gfork" Format_Version="0.01">
+     <Aging_Version Major="3" Minor="1" Age="3"/>
      <Description> GFork </Description>
 +    <Functional_Group>GridFTP</Functional_Group>
      <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
- 
      <src_pkg>
+         <Source_Dependencies Type="compile">
diff --git a/globus-gfork.spec b/globus-gfork.spec
index 8130295..55ea0ba 100644
--- a/globus-gfork.spec
+++ b/globus-gfork.spec
@@ -1,51 +1,30 @@
 %ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
 %else
-%global flavor gcc32pthr
+%global flavor gcc32
 %endif
 
 Name:		globus-gfork
 %global _name %(tr - _ <<< %{name})
-Version:	0.2
-Release:	6%{?dist}
+Version:	3.1
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GFork
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.0-all-source-installer.tar.bz2
-#		mv gt5.0.0-all-source-installer/source-trees/gridftp/gfork/source globus_gfork-0.2
-#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
-#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRIDFTP
-#		Remove some junk lines in the package description file:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
-Patch0:		%{name}.patch
-#		Undefined make variable:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
-Patch1:		%{name}-undefined.patch
-#		Fix location of default config file:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
-Patch2:		%{name}-etc.patch
-#		Fix cut & paste error in option description:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
-Patch3:		%{name}-opts.patch
-#		Missing direct dependencies:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
-Patch4:		%{name}-deps.patch
-#		Missing functional group:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7167
-Patch5:		%{name}-funcgrp.patch
+Patch0:		%{name}-funcgrp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-common
-BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-common-devel%{?_isa}
-BuildRequires:	globus-xio-devel%{?_isa} >= 2
+Requires:	globus-common%{?_isa} >= 14
+Requires:	globus-xio%{?_isa} >= 3
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-xio-devel%{?_isa} >= 3
 
 %package progs
 Summary:	Globus Toolkit - GFork Programs
@@ -56,8 +35,8 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Summary:	Globus Toolkit - GFork Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-common-devel%{?_isa}
-Requires:	globus-xio-devel%{?_isa} >= 2
+Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-xio-devel%{?_isa} >= 3
 
 %description
 The Globus Toolkit is an open source software toolkit used for building Grid
@@ -92,11 +71,6 @@ GFork Development Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -106,18 +80,15 @@ rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-# Remove flavor tags
-for f in `find . -name Makefile.am` ; do
-  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
-      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
-done
-sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-  -i pkgdata/pkg_data_src.gpt.in
-
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-%configure --with-flavor=%{flavor}
+%configure --disable-static --with-flavor=%{flavor} \
+	   --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 
 make %{?_smp_mflags}
 
@@ -129,20 +100,7 @@ GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
 
 # Remove libtool archives (.la files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-
-# Remove static libraries (.a files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# Generate pkg-config file from GPT metadata
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
-  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
-
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Install README file
 install -m 644 -p %{SOURCE8} \
@@ -153,9 +111,15 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 echo "# This is the default gfork configuration file" > \
   $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf
 
+# Remove README.txt from main package
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/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 \
@@ -172,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
 
 %files -f package-progs.filelist progs
@@ -182,9 +145,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-gfork-deps.patch, globus-gfork-etc.patch,
+  globus-gfork-opts.patch, globus-gfork.patch and globus-gfork-undefined.patch
+  (fixed upstream)
+
 * Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-6
 - Add README file
 - Add missing dependencies
diff --git a/sources b/sources
index a5836ee..f84c585 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f6b500e542c09ceaf175b0a66a3fc24  globus_gfork-0.2.tar.gz
+9433c4264fb697b3ec6b91093c2a11d4  globus_gfork-3.1.tar.gz

More information about the scm-commits mailing list