rpms/globus-xio-popen-driver/F-10 globus-xio-popen-driver-mingw.patch, NONE, 1.1 globus-xio-popen-driver.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-xio-popen-driver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27527/F-10

Modified Files:
	globus-xio-popen-driver.spec import.log 
Added Files:
	globus-xio-popen-driver-mingw.patch 
Log Message:
* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Update to official Fedora Globus packaging guidelines


globus-xio-popen-driver-mingw.patch:

--- NEW FILE globus-xio-popen-driver-mingw.patch ---
diff -ur globus_xio_popen_driver-0.2.orig/globus_xio_popen_driver.c globus_xio_popen_driver-0.2/globus_xio_popen_driver.c
--- globus_xio_popen_driver-0.2.orig/globus_xio_popen_driver.c	2008-09-18 08:16:35.000000000 +0200
+++ globus_xio_popen_driver-0.2/globus_xio_popen_driver.c	2009-05-08 06:42:59.000000000 +0200
@@ -391,6 +391,9 @@
     
     GlobusXIOPOpenDebugEnter();
     
+#ifdef WIN32
+    result = GlobusXIOErrorSystemResource("not available for windows");
+#else
     attr = (xio_l_popen_attr_t *) 
         driver_attr ? driver_attr : &xio_l_popen_attr_default;
     result = globus_l_xio_popen_handle_init(&handle);
@@ -456,6 +459,7 @@
 error_in_pipe:
     globus_l_xio_popen_handle_destroy(handle);
 error_handle:
+#endif
     GlobusXIOPOpenDebugExitWithError();
     return result;
 }


Index: globus-xio-popen-driver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-10/globus-xio-popen-driver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-popen-driver.spec	27 Apr 2009 23:06:23 -0000	1.1
+++ globus-xio-popen-driver.spec	15 Jun 2009 18:47:06 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-xio-popen-driver
 %global _name %(tr - _ <<< %{name})
 Version:	0.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus XIO Pipe Open Driver
 
 Group:		System Environment/Libraries
@@ -26,6 +26,9 @@ Patch0:		%{name}-wrong-dep.patch
 #		Correct package description:
 #		Already fixed in upstream CVS
 Patch1:		%{name}-wrong-desc.patch
+#		Fixes for mingw compilation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch2:		%{name}-mingw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
@@ -61,6 +64,7 @@ Globus XIO Pipe Open Driver Development 
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -89,6 +93,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
 # This library is opened using lt_dlopenext, so the libtool archives
 # (.la files) can not be removed - fix the libdir...
 for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
@@ -97,8 +103,7 @@ done
 
 # 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
@@ -110,9 +115,9 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{nam
 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
 
 %clean
@@ -133,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
+- Update to official Fedora Globus packaging guidelines
+
 * Fri Apr 24 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
 - Correct package description
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio-popen-driver/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Apr 2009 23:06:23 -0000	1.1
+++ import.log	15 Jun 2009 18:47:06 -0000	1.2
@@ -1 +1,2 @@
 globus-xio-popen-driver-0_2-2_fc9:F-10:globus-xio-popen-driver-0.2-2.fc9.src.rpm:1240873540
+globus-xio-popen-driver-0_2-3_fc9:F-10:globus-xio-popen-driver-0.2-3.fc9.src.rpm:1245091605