rpms/globus-xio/F-9 globus-xio-format.patch, NONE, 1.1 globus-xio-mingw.patch, NONE, 1.1 globus-xio.spec, 1.2, 1.3 import.log, 1.2, 1.3

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9206/F-9

Modified Files:
	globus-xio.spec import.log 
Added Files:
	globus-xio-format.patch globus-xio-mingw.patch 
Log Message:
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-4
- Update to official Fedora Globus packaging guidelines


globus-xio-format.patch:

--- NEW FILE globus-xio-format.patch ---
diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http_header_info.c globus_xio-2.7/builtins/http/globus_xio_http_header_info.c
--- globus_xio-2.7.orig/builtins/http/globus_xio_http_header_info.c	2006-01-19 06:57:40.000000000 +0100
+++ globus_xio-2.7/builtins/http/globus_xio_http_header_info.c	2009-06-03 23:40:26.000000000 +0200
@@ -164,12 +164,13 @@
     globus_result_t                     result = GLOBUS_SUCCESS;
     globus_xio_http_header_t *          header;
     int                                 rc;
+    unsigned long                       length;
     GlobusXIOName(globus_l_xio_http_header_set);
 
     /* Special cases for entity-body handling headers */
     if (strcmp(header_name, "Content-Length") == 0)
     {
-        rc = sscanf(header_value, "%u", &headers->content_length);
+        rc = sscanf(header_value, "%lu", &length);
 
         if (rc < 1)
         {
@@ -177,6 +178,7 @@
 
             goto error_exit;
         }
+        headers->content_length = length;
         headers->flags |= GLOBUS_I_XIO_HTTP_HEADER_CONTENT_LENGTH_SET;
     }
     else if (strcmp(header_name, "Transfer-Encoding") == 0)

globus-xio-mingw.patch:

--- NEW FILE globus-xio-mingw.patch ---
diff -ur globus_xio-2.7.orig/globus_i_xio_system_common.h globus_xio-2.7/globus_i_xio_system_common.h
--- globus_xio-2.7.orig/globus_i_xio_system_common.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_i_xio_system_common.h	2009-05-07 10:53:51.000000000 +0200
@@ -61,7 +61,7 @@
         ("[%s] fd=%lu, Exiting with error\n", _xio_name, (unsigned long)(fd)))
 
 #ifdef WIN32
-#include <Winsock2.h>
+#include <winsock2.h>
 #define GlobusXIOSystemUpdateErrno() (errno = WSAGetLastError())
 #elif defined(TARGET_ARCH_NETOS)
 #define GlobusXIOSystemUpdateErrno() (errno = getErrno())
diff -ur globus_xio-2.7.orig/globus_i_xio_win32.h globus_xio-2.7/globus_i_xio_win32.h
--- globus_xio-2.7.orig/globus_i_xio_win32.h	2008-04-07 21:50:34.000000000 +0200
+++ globus_xio-2.7/globus_i_xio_win32.h	2009-05-07 10:53:51.000000000 +0200
@@ -9,9 +9,9 @@
 #define GLOBUS_I_XIO_WIN32_H_
 
 #include "globus_i_xio_system_common.h"
-#include <Windows.h>
+#include <windows.h>
 #include <process.h>
-#include <Winsock2.h>
+#include <winsock2.h>
 
 typedef struct globus_l_xio_win32_event_entry_s *
     globus_i_xio_win32_event_entry_t;
diff -ur globus_xio-2.7.orig/globus_i_xio_win32_mode.c globus_xio-2.7/globus_i_xio_win32_mode.c
--- globus_xio-2.7.orig/globus_i_xio_win32_mode.c	2008-04-07 21:50:34.000000000 +0200
+++ globus_xio-2.7/globus_i_xio_win32_mode.c	2009-05-07 12:41:18.000000000 +0200
@@ -34,12 +34,6 @@
     ULONG                               Mode;
 } FILE_MODE_INFORMATION;
 
-enum
-{
-    FILE_SYNCHRONOUS_IO_ALERT           = 0x00000010,
-    FILE_SYNCHRONOUS_IO_NONALERT        = 0x00000020
-};
-
 typedef NTSTATUS
 (__stdcall *globus_i_xio_win32_mode_nqif_t)(
     HANDLE                              FileHandle,
diff -ur globus_xio-2.7.orig/globus_xio_system.h globus_xio-2.7/globus_xio_system.h
--- globus_xio-2.7.orig/globus_xio_system.h	2008-03-12 20:01:11.000000000 +0100
+++ globus_xio-2.7/globus_xio_system.h	2009-05-07 10:53:51.000000000 +0200
@@ -31,8 +31,8 @@
 
 #ifdef WIN32
 
-#include <Windows.h>
-#include <Winsock2.h>
+#include <windows.h>
+#include <winsock2.h>
 #define GLOBUS_XIO_SYSTEM_INVALID_FILE INVALID_HANDLE_VALUE
 #define GLOBUS_XIO_SYSTEM_INVALID_SOCKET INVALID_SOCKET
 


Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-9/globus-xio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- globus-xio.spec	27 Apr 2009 21:27:54 -0000	1.2
+++ globus-xio.spec	15 Jun 2009 17:55:21 -0000	1.3
@@ -7,7 +7,7 @@
 Name:		globus-xio
 %global _name %(tr - _ <<< %{name})
 Version:	2.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Globus Toolkit - Globus XIO Framework
 
 Group:		System Environment/Libraries
@@ -32,6 +32,12 @@ Patch1:		%{name}-bad-age.patch
 #		Dereferencing of type-punned pointers:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6605
 Patch2:		%{name}-type-punned-pointer.patch
+#		Fixes for mingw compilation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch3:		%{name}-mingw.patch
+#		Fix format errors:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6757
+Patch4:		%{name}-format.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
@@ -39,18 +45,11 @@ BuildRequires:	grid-packaging-tools
 BuildRequires:	globus-common-devel >= 4
 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
@@ -105,6 +104,8 @@ Globus XIO Framework Documentation Files
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -148,15 +149,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
@@ -167,7 +168,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
 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
 
 # Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_xio_driver.3 \
@@ -175,23 +176,21 @@ for f in $RPM_BUILD_ROOT%{_mandir}/man3/
   sed 's/P\.RS/P\n.RS/' -i $f
 done
 
-# 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}_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
@@ -216,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-4
+- Update to official Fedora Globus packaging guidelines
+
 * Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-3
 - Rebuild with updated libtool
 
@@ -233,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.4
 - Add s390x to the list of 64 bit platforms
 
-* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.3
 - Adapt to updated GPT package
 
 * Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-0.2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Apr 2009 21:27:54 -0000	1.2
+++ import.log	15 Jun 2009 17:55:21 -0000	1.3
@@ -1,2 +1,3 @@
 globus-xio-2_7-2_fc9:F-9:globus-xio-2.7-2.fc9.src.rpm:1240392561
 globus-xio-2_7-3_fc9:F-9:globus-xio-2.7-3.fc9.src.rpm:1240867637
+globus-xio-2_7-4_fc9:F-9:globus-xio-2.7-4.fc9.src.rpm:1245088496