[globus-gass-copy/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-gass-copy-doxygen.patch, globus-gass-copy-mingw.p

Mattias Ellert ellert at fedoraproject.org
Sun Jan 8 01:20:29 UTC 2012


commit e19265901df2a32395f2330b6a6f83183163b919
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Jan 7 16:48:00 2012 +0100

    Update to Globus Toolkit 5.2.0
    Drop patches globus-gass-copy-doxygen.patch, globus-gass-copy-mingw.patch
    and globus-gass-copy-pathmax.patch (fixed upstream)

 .gitignore                     |    2 +-
 GLOBUS-GRIDFTP                 |    6 ++
 globus-gass-copy-deps.patch    |   84 ++++++++++++++++++++------
 globus-gass-copy-doxygen.patch |   58 ++++++++++++++----
 globus-gass-copy-format.patch  |   63 ++++++++++++++++++++
 globus-gass-copy-mingw.patch   |  127 ----------------------------------------
 globus-gass-copy-pathmax.patch |   55 -----------------
 globus-gass-copy.spec          |  127 ++++++++++++++++++----------------------
 sources                        |    2 +-
 9 files changed, 237 insertions(+), 287 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d241e87..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /epstopdf-2.9.5gw
-/globus_gass_copy-5.14.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-gass-copy-deps.patch b/globus-gass-copy-deps.patch
index 2f3a1be..b4f8dc4 100644
--- a/globus-gass-copy-deps.patch
+++ b/globus-gass-copy-deps.patch
@@ -1,30 +1,74 @@
-diff -ur globus_gass_copy-5.10.orig/pkgdata/pkg_data_src.gpt.in globus_gass_copy-5.10/pkgdata/pkg_data_src.gpt.in
---- globus_gass_copy-5.10.orig/pkgdata/pkg_data_src.gpt.in	2011-02-08 21:35:10.000000000 +0100
-+++ globus_gass_copy-5.10/pkgdata/pkg_data_src.gpt.in	2011-02-25 06:00:44.649900521 +0100
-@@ -23,7 +23,7 @@
+diff -ur globus_gass_copy-8.2.orig/configure.in globus_gass_copy-8.2/configure.in
+--- globus_gass_copy-8.2.orig/configure.in	2008-10-29 23:59:05.000000000 +0100
++++ globus_gass_copy-8.2/configure.in	2011-12-15 09:04:56.590214032 +0100
+@@ -14,6 +14,7 @@
+ AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
+ 
+ 
++GLOBUS_OPENSSL
+ 
+ LAC_DOXYGEN("../")
+ 
+diff -ur globus_gass_copy-8.2.orig/pkgdata/pkg_data_src.gpt.in globus_gass_copy-8.2/pkgdata/pkg_data_src.gpt.in
+--- globus_gass_copy-8.2.orig/pkgdata/pkg_data_src.gpt.in	2011-12-05 15:18:34.000000000 +0100
++++ globus_gass_copy-8.2/pkgdata/pkg_data_src.gpt.in	2011-12-15 09:06:04.893323167 +0100
+@@ -27,6 +27,11 @@
+                     <Simple_Version Major="4"/>
+                 </Version>
              </Dependency>
-             <Dependency Name="globus_ftp_client">
++            <Dependency Name="globus_gsi_sysconfig">
++                <Version>
++                    <Simple_Version Major="4"/>
++                </Version>
++            </Dependency>
+             <Dependency Name="globus_gass_transfer">
                  <Version>
--                    <Simple_Version Major="5"/>
-+                    <Simple_Version Major="6"/>
+                     <Simple_Version Major="7"/>
+@@ -42,6 +47,11 @@
+                     <Simple_Version Major="9"/>
                  </Version>
              </Dependency>
-             <Dependency Name="globus_ftp_control">
-@@ -56,7 +56,7 @@
-             </Dependency>
-             <Dependency Name="globus_ftp_client">
-                 <Version>
--                    <Simple_Version Major="5"/>
-+                    <Simple_Version Major="6"/>
++            <Dependency Name="globus_gssapi_error">
++                <Version>
++                    <Simple_Version Major="4"/>
++                </Version>
++            </Dependency>
+         </Source_Dependencies>
+         <Source_Dependencies Type="lib_link">
+             <Dependency Name="globus_common">
+@@ -69,11 +79,6 @@
+                     <Simple_Version Major="8"/>
                  </Version>
              </Dependency>
-             <Dependency Name="globus_ftp_control">
-@@ -89,7 +89,7 @@
+-            <Dependency Name="globus_gssapi_gsi">
+-                <Version>
+-                    <Simple_Version Major="9"/>
+-                </Version>
+-            </Dependency>
+         </Source_Dependencies>
+         <Source_Dependencies Type="pgm_link">
+             <Dependency Name="globus_common">
+@@ -91,6 +96,11 @@
+                     <Simple_Version Major="4"/>
+                 </Version>
              </Dependency>
-             <Dependency Name="globus_ftp_client">
++            <Dependency Name="globus_gsi_sysconfig">
++                <Version>
++                    <Simple_Version Major="4"/>
++                </Version>
++            </Dependency>
+             <Dependency Name="globus_gass_transfer">
                  <Version>
--                    <Simple_Version Major="5"/>
-+                    <Simple_Version Major="6"/>
+                     <Simple_Version Major="7"/>
+@@ -111,6 +121,11 @@
+                     <Simple_Version Major="9"/>
                  </Version>
              </Dependency>
-             <Dependency Name="globus_ftp_control">
++            <Dependency Name="globus_gssapi_error">
++                <Version>
++                    <Simple_Version Major="4"/>
++                </Version>
++            </Dependency>
+         </Source_Dependencies>
+         <With_Flavors ColocateLibraries="no" build="yes"/>
+         <Build_Environment>
diff --git a/globus-gass-copy-doxygen.patch b/globus-gass-copy-doxygen.patch
index e74d8c0..cadcb1c 100644
--- a/globus-gass-copy-doxygen.patch
+++ b/globus-gass-copy-doxygen.patch
@@ -1,12 +1,46 @@
-diff -ur globus_gass_copy-4.14.orig/globus_gass_copy.c globus_gass_copy-4.14/globus_gass_copy.c
---- globus_gass_copy-4.14.orig/globus_gass_copy.c	2008-03-12 20:01:06.000000000 +0100
-+++ globus_gass_copy-4.14/globus_gass_copy.c	2008-10-21 20:47:48.000000000 +0200
-@@ -903,7 +903,7 @@
-  *
-  * @param attr
-  *      A globus_gass_copy attribute structure
-- * @param io_attr
-+ * @param gass_attr
-  *      The http/https attributes to be used
-  *
-  * @return
+diff -ur globus_gass_copy-8.2.orig/globus_gass_copy.h globus_gass_copy-8.2/globus_gass_copy.h
+--- globus_gass_copy-8.2.orig/globus_gass_copy.h	2011-02-11 21:28:08.000000000 +0100
++++ globus_gass_copy-8.2/globus_gass_copy.h	2012-01-05 12:01:33.158928142 +0100
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ 
++#ifndef GLOBUS_INCLUDE_GLOBUS_GASS_COPY_H
++#define GLOBUS_INCLUDE_GLOBUS_GASS_COPY_H
++
+  /** 
+  * @file
+  *  Header file for the gass copy library 
+@@ -48,9 +51,6 @@
+ #include "globus_ftp_client.h"
+ #include "globus_io.h"
+ 
+-#ifndef GLOBUS_INCLUDE_GLOBUS_GASS_COPY_H
+-#define GLOBUS_INCLUDE_GLOBUS_GASS_COPY_H
+-
+ #ifndef EXTERN_C_BEGIN
+ #ifdef __cplusplus
+ #define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_gass_copy-8.2.orig/globus_i_gass_copy.h globus_gass_copy-8.2/globus_i_gass_copy.h
+--- globus_gass_copy-8.2.orig/globus_i_gass_copy.h	2011-02-11 21:28:08.000000000 +0100
++++ globus_gass_copy-8.2/globus_i_gass_copy.h	2012-01-05 12:00:03.414913290 +0100
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ 
++#ifndef GLOBUS_L_INCLUDE_GLOBUS_GASS_COPY_H
++#define GLOBUS_L_INCLUDE_GLOBUS_GASS_COPY_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+  * @file globus_i_gass_copy.h
+@@ -25,9 +28,6 @@
+ #include "globus_common.h"
+ #include "globus_error_string.h"
+ 
+-#ifndef GLOBUS_L_INCLUDE_GLOBUS_GASS_COPY_H
+-#define GLOBUS_L_INCLUDE_GLOBUS_GASS_COPY_H
+-
+ #ifndef EXTERN_C_BEGIN
+ #ifdef __cplusplus
+ #define EXTERN_C_BEGIN extern "C" {
diff --git a/globus-gass-copy-format.patch b/globus-gass-copy-format.patch
new file mode 100644
index 0000000..6292d8b
--- /dev/null
+++ b/globus-gass-copy-format.patch
@@ -0,0 +1,63 @@
+diff -ur globus_gass_copy-8.2.orig/globus_url_copy.c globus_gass_copy-8.2/globus_url_copy.c
+--- globus_gass_copy-8.2.orig/globus_url_copy.c	2011-12-05 17:35:00.000000000 +0100
++++ globus_gass_copy-8.2/globus_url_copy.c	2011-12-28 23:23:20.347277627 +0100
+@@ -1905,13 +1905,13 @@
+         if(globus_l_guc_init_gass_copy_handle(
+                &guc_info.handles[i]->gass_copy_handle, &guc_info, i) != 0)
+         {
+-            fprintf(stderr, _GASCSL("Failed to initialize handle.\n"));
++            fprintf(stderr, "%s", _GASCSL("Failed to initialize handle.\n"));
+             return 1;
+         }
+         if(globus_l_guc_init_gass_copy_handle(
+                &guc_info.handles[i]->cksm_gass_copy_handle, &guc_info, i) != 0)
+         {
+-            fprintf(stderr, _GASCSL("Failed to initialize handle.\n"));
++            fprintf(stderr, "%s", _GASCSL("Failed to initialize handle.\n"));
+             return 1;
+         }
+ 
+@@ -2472,14 +2472,14 @@
+ 
+         if(strcmp(src_url, "-") == 0 && strcmp(dst_url, "-") == 0)
+         {
+-            fprintf(stderr, _GASCSL("stdin and stdout cannot be used together.\n"));
++            fprintf(stderr, "%s", _GASCSL("stdin and stdout cannot be used together.\n"));
+             goto error_parse;
+         }
+         if(strcmp(src_url, "-") == 0)
+         {
+             if(stdin_used)
+             {
+-                fprintf(stderr, _GASCSL("stdin can only be used once.\n"));
++                fprintf(stderr, "%s", _GASCSL("stdin can only be used once.\n"));
+                 goto error_parse;
+             }
+             stdin_used = GLOBUS_TRUE;
+@@ -2976,7 +2976,7 @@
+         if(globus_l_globus_url_copy_ctrlc &&
+            !globus_l_globus_url_copy_ctrlc_handled)
+         {
+-            fprintf(stderr, _GASCSL("\nCancelling copy...\n"));
++            fprintf(stderr, "%s", _GASCSL("\nCancelling copy...\n"));
+             guc_info->cancelled = GLOBUS_TRUE;
+             
+             if(guc_info->dumpfile || guc_info->dump_only_file)
+@@ -3883,7 +3883,7 @@
+         sc = sscanf(instance->values[0], "%d", &guc_info->nl_interval);
+         if(sc != 1)
+         {
+-            fprintf(stderr,
++            fprintf(stderr, "%s",
+                _GASCSL("Error: Argument to nl-bottleneck must be a 4 bit mask"
+                 "\n"));
+             return -1;
+@@ -5696,7 +5696,7 @@
+                 _GASCSL("Error: Unable to register performance handler %s\n"),
+                 globus_error_print_friendly(globus_error_peek(result)));
+ 
+-            fprintf(stderr, _GASCSL("Continuing without performance info\n"));
++            fprintf(stderr, "%s", _GASCSL("Continuing without performance info\n"));
+         }
+     }
+ 
diff --git a/globus-gass-copy.spec b/globus-gass-copy.spec
index 73c777a..662a124 100644
--- a/globus-gass-copy.spec
+++ b/globus-gass-copy.spec
@@ -1,54 +1,45 @@
 %ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
 %else
-%global flavor gcc32pthr
+%global flavor gcc32
 %endif
 
 Name:		globus-gass-copy
 %global _name %(tr - _ <<< %{name})
-Version:	5.14
-Release:	3%{?dist}
+Version:	8.2
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus Gass Copy
 
 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.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.4-all-source-installer.tar.bz2
-#		mv gt5.0.4-all-source-installer/source-trees/gass/copy/source globus_gass_copy-5.14
-#		cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_copy-5.14
-#		tar -zcf globus_gass_copy-5.14.tar.gz globus_gass_copy-5.14
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
 Source1:	globus-url-copy.1
 #		README file
 Source8:	GLOBUS-GRIDFTP
 #		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
-#		Fix some doxygen warnings:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6592
-Patch0:		%{name}-doxygen.patch
-#		Fixes for mingw compilation:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch1:		%{name}-mingw.patch
-#		Not all platforms defines PATH_MAX:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6756
-Patch2:		%{name}-pathmax.patch
-#		Correct the dependency requirements:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7137
-Patch3:		%{name}-deps.patch
+Patch0:		%{name}-deps.patch
+Patch1:		%{name}-format.patch
+Patch2:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-ftp-client%{?_isa} >= 6
-BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-ftp-client-devel%{?_isa} >= 6
-BuildRequires:	globus-common-devel%{?_isa} >= 6
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
-BuildRequires:	globus-io-devel%{?_isa} >= 3
-BuildRequires:	globus-gass-transfer-devel%{?_isa} >= 2
-BuildRequires:	globus-ftp-control-devel%{?_isa} >= 1
-BuildRequires:	globus-core%{?_isa} >= 4
+Requires:	globus-ftp-client%{?_isa} >= 7
+Requires:	globus-common%{?_isa} >= 14
+Requires:	globus-io%{?_isa} >= 8
+Requires:	globus-gass-transfer%{?_isa} >= 7
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-ftp-client-devel%{?_isa} >= 7
+BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 9
+BuildRequires:	globus-ftp-control-devel%{?_isa} >= 4
+BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 4
+BuildRequires:	globus-gssapi-error-devel%{?_isa} >= 4
+BuildRequires:	globus-gass-transfer-devel%{?_isa} >= 7
+BuildRequires:	globus-io-devel%{?_isa} >= 8
+BuildRequires:	openssl-devel%{?_isa}
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -65,18 +56,27 @@ BuildRequires:	tetex-latex
 Summary:	Globus Toolkit - Globus Gass Copy Programs
 Group:		Applications/Internet
 Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-ftp-client%{?_isa} >= 7
+Requires:	globus-gsi-sysconfig%{?_isa} >= 4
+Requires:	globus-common%{?_isa} >= 14
+Requires:	globus-gssapi-error%{?_isa} >= 4
+Requires:	globus-gssapi-gsi%{?_isa} >= 9
+Requires:	globus-io%{?_isa} >= 8
+Requires:	globus-gass-transfer%{?_isa} >= 7
 
 %package devel
 Summary:	Globus Toolkit - Globus Gass Copy Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-ftp-client-devel%{?_isa} >= 6
-Requires:	globus-common-devel%{?_isa} >= 6
-Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4
-Requires:	globus-io-devel%{?_isa} >= 3
-Requires:	globus-gass-transfer-devel%{?_isa} >= 2
-Requires:	globus-ftp-control-devel%{?_isa} >= 1
-Requires:	globus-core%{?_isa} >= 4
+Requires:	globus-ftp-client-devel%{?_isa} >= 7
+Requires:	globus-gssapi-gsi-devel%{?_isa} >= 9
+Requires:	globus-ftp-control-devel%{?_isa} >= 4
+Requires:	globus-core%{?_isa} >= 8
+Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-gsi-sysconfig-devel%{?_isa} >= 4
+Requires:	globus-gssapi-error-devel%{?_isa} >= 4
+Requires:	globus-gass-transfer-devel%{?_isa} >= 7
+Requires:	globus-io-devel%{?_isa} >= 8
 
 %package doc
 Summary:	Globus Toolkit - Globus Gass Copy Documentation Files
@@ -127,7 +127,6 @@ Globus Gass Copy Documentation Files
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -146,18 +145,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} --enable-doxygen
+%configure --disable-static --with-flavor=%{flavor} \
+	   --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 
 make %{?_smp_mflags}
 
@@ -173,32 +169,18 @@ 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
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.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
-
-# Move documentation to default RPM location
-mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-sed s!doc/%{_name}!doc/%{name}-%{version}! \
-  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+# Move license file to main package
+grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 # Install man page
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1
@@ -228,7 +210,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
@@ -237,13 +218,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.2-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-gass-copy-doxygen.patch, globus-gass-copy-mingw.patch
+  and globus-gass-copy-pathmax.patch (fixed upstream)
+
 * Sun Oct 02 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.14-3
 - Add contributed man page
 
diff --git a/sources b/sources
index 2930e45..b86cd68 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-0705451ac7bf41d0ac2bf22cd2261bca  globus_gass_copy-5.14.tar.gz
+78c9cee19d587621a343c828164f1716  globus_gass_copy-8.2.tar.gz


More information about the scm-commits mailing list