diff --git a/globus-gass-copy-mingw.patch b/globus-gass-copy-mingw.patch new file mode 100644 index 0000000..9cddeb0 --- /dev/null +++ b/globus-gass-copy-mingw.patch @@ -0,0 +1,28 @@ +diff -ur globus_gass_copy-4.14.orig/globus_gass_copy_glob.c globus_gass_copy-4.14/globus_gass_copy_glob.c +--- globus_gass_copy-4.14.orig/globus_gass_copy_glob.c 2009-05-09 14:57:20.000000000 +0200 ++++ globus_gass_copy-4.14/globus_gass_copy_glob.c 2009-05-09 14:56:14.000000000 +0200 +@@ -1425,7 +1425,11 @@ + goto error_null_path; + } + ++#ifndef TARGET_ARCH_WIN32 + rc = mkdir(parsed_url.url_path, 0777); ++#else ++ rc = mkdir(parsed_url.url_path); ++#endif + + if(rc != 0) + { +diff -ur globus_gass_copy-4.14.orig/globus_url_copy.c globus_gass_copy-4.14/globus_url_copy.c +--- globus_gass_copy-4.14.orig/globus_url_copy.c 2008-10-02 16:33:50.000000000 +0200 ++++ globus_gass_copy-4.14/globus_url_copy.c 2009-05-09 14:59:33.000000000 +0200 +@@ -46,6 +46,9 @@ + */ + #include "globus_io.h" + #include "version.h" /* provides local_version */ ++#ifdef WIN32 ++#include "openssl/applink.c" ++#endif + + #define GUC_URL_ENC_CHAR "#;:=+ ," + diff --git a/globus-gass-copy-pathmax.patch b/globus-gass-copy-pathmax.patch new file mode 100644 index 0000000..e622eb5 --- /dev/null +++ b/globus-gass-copy-pathmax.patch @@ -0,0 +1,55 @@ +diff -ur globus_gass_copy-4.14.orig/globus_gass_copy_glob.c globus_gass_copy-4.14/globus_gass_copy_glob.c +--- globus_gass_copy-4.14.orig/globus_gass_copy_glob.c 2007-12-06 20:43:21.000000000 +0100 ++++ globus_gass_copy-4.14/globus_gass_copy_glob.c 2009-06-03 17:32:13.000000000 +0200 +@@ -20,6 +20,9 @@ + #include + #endif + ++#ifndef MAXPATHLEN ++#define MAXPATHLEN 4096 ++#endif + + /************************************************************ + * glob support +diff -ur globus_gass_copy-4.14.orig/globus_url_copy.c globus_gass_copy-4.14/globus_url_copy.c +--- globus_gass_copy-4.14.orig/globus_url_copy.c 2008-10-02 16:33:50.000000000 +0200 ++++ globus_gass_copy-4.14/globus_url_copy.c 2009-06-03 17:21:01.000000000 +0200 +@@ -41,6 +41,7 @@ + #include "globus_gass_copy.h" + #include "globus_ftp_client_debug_plugin.h" + #include "globus_ftp_client_restart_plugin.h" ++#include "globus_gsi_system_config.h" + /* + * use globus_io for netlogger stuff + */ +@@ -2311,7 +2312,8 @@ + char * in_url) + { + char * tmp_ptr; +- char start_dir[PATH_MAX]; ++ char * start_dir = NULL; ++ globus_result_t result; + char * dir_ptr = ""; + + +@@ -2324,8 +2326,8 @@ + + if(in_url[0] != '/') + { +- tmp_ptr = getcwd(start_dir, PATH_MAX); +- if(tmp_ptr == NULL) ++ result = GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&start_dir); ++ if(result != GLOBUS_SUCCESS) + { + /* just punt if the system call fails */ + return strdup(in_url); +@@ -2335,6 +2337,9 @@ + tmp_ptr = globus_common_create_string("file://%s/%s", + dir_ptr, in_url); + ++ if (start_dir) ++ globus_free(start_dir); ++ + return tmp_ptr; + } + diff --git a/globus-gass-copy.spec b/globus-gass-copy.spec index 0dfa4da..80aeb0e 100644 --- a/globus-gass-copy.spec +++ b/globus-gass-copy.spec @@ -7,7 +7,7 @@ Name: globus-gass-copy %global _name %(tr - _ <<< %{name}) Version: 4.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Globus Toolkit - Globus Gass Copy Group: System Environment/Libraries @@ -26,6 +26,12 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-common @@ -37,18 +43,11 @@ BuildRequires: globus-gass-transfer-devel >= 2 BuildRequires: globus-ftp-control-devel >= 1 BuildRequires: globus-core >= 4 BuildRequires: doxygen -%if %{?fedora}%{!?fedora:0} >= 3 -BuildRequires: graphviz -BuildRequires: ghostscript -%else -%if %{?rhel}%{!?rhel:0} >= 5 BuildRequires: graphviz BuildRequires: ghostscript %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif -%endif -%endif %if %{?fedora}%{!?fedora:0} >= 9 BuildRequires: tex(latex) %else @@ -119,6 +118,8 @@ Globus Gass Copy Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %if "%{rhel}" == "5" mkdir bin @@ -160,15 +161,15 @@ export PATH=$PWD/bin:$PATH rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +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 $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist +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 $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist +sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist # Generate pkg-config file from GPT metadata mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig @@ -179,27 +180,25 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ - -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist + -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist -# Remove unwanted documentation -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 +# Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 -sed -e '/deprecated\.3/d' \ - -e '/_%{_name}-%{version}_.*\.3/d' \ - -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist +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} # Generate package filelists -cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \ +cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist -cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \ +cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ | sed s!^!%{_prefix}! > package-progs.filelist -cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \ +cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist -cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \ +cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean @@ -227,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_docdir}/%{name}-%{version}/html %changelog +* Thu Jun 04 2009 Mattias Ellert - 4.14-2 +- Update to official Fedora Globus packaging guidelines + * Thu Apr 16 2009 Mattias Ellert - 4.14-1 - Make comment about source retrieval more explicit - Change defines to globals @@ -239,7 +241,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Feb 26 2009 Mattias Ellert - 4.14-0.4 - Add s390x to the list of 64 bit platforms -* Thu Jan 1 2009 Mattias Ellert - 4.14-0.3 +* Thu Jan 01 2009 Mattias Ellert - 4.14-0.3 - Adapt to updated GPT package * Tue Oct 21 2008 Mattias Ellert - 4.14-0.2 diff --git a/import.log b/import.log index 402c2db..58711ae 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ globus-gass-copy-4_14-1_fc9:EL-5:globus-gass-copy-4.14-1.fc9.src.rpm:1244257937 +globus-gass-copy-4_14-2_fc9:EL-5:globus-gass-copy-4.14-2.fc9.src.rpm:1245097492