rpms/globus-rls-client/F-9 globus-rls-client-mingw.patch, NONE, 1.1 globus-rls-client.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

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

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


globus-rls-client-mingw.patch:

--- NEW FILE globus-rls-client-mingw.patch ---
diff -ur globus_rls_client-5.1.orig/cli.c globus_rls_client-5.1/cli.c
--- globus_rls_client-5.1.orig/cli.c	2008-05-30 18:33:29.000000000 +0200
+++ globus_rls_client-5.1/cli.c	2009-05-09 11:19:17.000000000 +0200
@@ -295,7 +295,8 @@
   char			buf[BUFSIZ];
   int			iargc;
   char			*iargv[MAXCMD];
-  struct        sigaction	sa;
+#ifndef WIN32
+  struct sigaction	sa;
 
   sigemptyset(&sa.sa_mask);
   sa.sa_handler = hsig;
@@ -303,6 +304,7 @@
 
   sigaction(SIGINT, &sa, NULL);
   sigaction(SIGTERM, &sa, NULL); 
+#endif
 
   for (i = 0; i < NMODS; i++)
     if ((rc = globus_module_activate(modules[i])) != GLOBUS_SUCCESS) {
diff -ur globus_rls_client-5.1.orig/library/client.c globus_rls_client-5.1/library/client.c
--- globus_rls_client-5.1.orig/library/client.c	2006-06-01 02:37:03.000000000 +0200
+++ globus_rls_client-5.1/library/client.c	2009-05-09 11:02:29.000000000 +0200
@@ -1593,7 +1593,7 @@
 
   switch (type) {
     case globus_rls_attr_type_date:
-      if (!strptime(sval, "%Y-%m-%d %H:%M:%S", &t))
+      if (!globus_strptime(sval, "%Y-%m-%d %H:%M:%S", &t))
         return mkresult(GLOBUS_RLS_BADARG, sval);
       t.tm_isdst = -1;
       attr->val.t = mktime(&t);
diff -ur globus_rls_client-5.1.orig/library/rpc.c globus_rls_client-5.1/library/rpc.c
--- globus_rls_client-5.1.orig/library/rpc.c	2006-06-01 02:37:03.000000000 +0200
+++ globus_rls_client-5.1/library/rpc.c	2009-05-09 11:02:29.000000000 +0200
@@ -126,7 +126,7 @@
 {
   globus_result_t   r;
   IOMON             mon;
-  struct timespec   ts;
+  globus_abstime_t  ts;
   globus_bool_t     timed_out = GLOBUS_FALSE;
 
   globus_mutex_init(&mon.mtx, GLOBUS_NULL);
@@ -183,7 +183,7 @@
   globus_result_t	r;
   globus_size_t		try_nb;
   IOMON			mon;
-  struct timespec	ts;
+  globus_abstime_t	ts;
 
   r = globus_io_try_read(h, buf, max_nb, nbr);
   if (r != GLOBUS_SUCCESS)
@@ -252,7 +252,7 @@
   globus_result_t	r;
   globus_size_t		try_nb;
   IOMON			mon;
-  struct timespec	ts;
+  globus_abstime_t	ts;
 
   r = globus_io_try_write(h, buf, nb, nbw);
   if (r != GLOBUS_SUCCESS)
@@ -305,7 +305,7 @@
 {
   globus_result_t	r;
   IOMON			mon;
-  struct timespec	ts;
+  globus_abstime_t	ts;
 
   globus_mutex_init(&mon.mtx, GLOBUS_NULL);
   globus_cond_init(&mon.cond, GLOBUS_NULL);


Index: globus-rls-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-9/globus-rls-client.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rls-client.spec	1 Jun 2009 22:05:15 -0000	1.1
+++ globus-rls-client.spec	15 Jun 2009 21:07:24 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-rls-client
 %global _name %(tr - _ <<< %{name})
 Version:	5.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Client
 
 Group:		System Environment/Libraries
@@ -33,6 +33,9 @@ Patch1:		%{name}-doxygen.patch
 #		Fix format errors:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6750
 Patch2:		%{name}-format.patch
+#		Fixes for mingw compilation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch3:		%{name}-mingw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
@@ -42,18 +45,11 @@ BuildRequires:	globus-gssapi-gsi-devel >
 BuildRequires:	globus-io-devel >= 3
 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
@@ -124,6 +120,7 @@ Replica Location Service Client Document
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -165,15 +162,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
@@ -182,36 +179,34 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
 
 # Move client man page to progs package
 grep globus-rls-cli.1 \
-  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
-  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
+  $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
 sed /globus-rls-cli.1/d \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # 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 $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 -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > 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
@@ -239,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-3
+- Update to official Fedora Globus packaging guidelines
+
 * Mon Jun 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-2
 - Fix documentation build
 
@@ -254,7 +252,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-0.4
 - Add s390x to the list of 64 bit platforms
 
-* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-0.3
 - Adapt to updated GPT package
 
 * Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-0.2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Jun 2009 22:05:16 -0000	1.1
+++ import.log	15 Jun 2009 21:07:24 -0000	1.2
@@ -1 +1,2 @@
 globus-rls-client-5_1-2_fc9:F-9:globus-rls-client-5.1-2.fc9.src.rpm:1243893886
+globus-rls-client-5_1-3_fc9:F-9:globus-rls-client-5.1-3.fc9.src.rpm:1245100023