rpms/globus-rls-client/F-11 .cvsignore, 1.2, 1.3 globus-rls-client-doxygen.patch, 1.1, 1.2 globus-rls-client-format.patch, 1.1, 1.2 globus-rls-client.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-rls-client.patch, 1.1, NONE

Tue Feb 9 08:54:00 UTC 2010

Author: ellert

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

Modified Files:
	.cvsignore globus-rls-client-doxygen.patch 
	globus-rls-client-format.patch globus-rls-client.spec 
	import.log sources 
Removed Files:
	globus-rls-client.patch 
Log Message:
* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.2-1
- Update to Globus Toolkit 5.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	1 Jun 2009 22:09:20 -0000	1.2
+++ .cvsignore	9 Feb 2010 08:54:00 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_rls_client-5.1.tar.gz
+globus_rls_client-5.2.tar.gz

globus-rls-client-doxygen.patch:
 Doc/man/Makefile.am         |    3 +--
 library/globus_rls_client.h |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

Index: globus-rls-client-doxygen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-11/globus-rls-client-doxygen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rls-client-doxygen.patch	1 Jun 2009 22:09:20 -0000	1.1
+++ globus-rls-client-doxygen.patch	9 Feb 2010 08:54:00 -0000	1.2
@@ -1,18 +1,6 @@
-diff -ur globus_rls_client-5.1.orig/configure.in globus_rls_client-5.1/configure.in
---- globus_rls_client-5.1.orig/configure.in	2009-05-09 09:35:21.000000000 +0200
-+++ globus_rls_client-5.1/configure.in	2009-05-09 13:04:06.000000000 +0200
-@@ -12,7 +12,7 @@
- dnl Initialize the automake rules the last argument
- AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
- 
--LAC_DOXYGEN([" ../ "])
-+LAC_DOXYGEN(["../library"])
- 
- GLOBUS_FINALIZE
- 
-diff -ur globus_rls_client-5.1.orig/Doc/man/Makefile.am globus_rls_client-5.1/Doc/man/Makefile.am
---- globus_rls_client-5.1.orig/Doc/man/Makefile.am	2002-12-12 02:47:06.000000000 +0100
-+++ globus_rls_client-5.1/Doc/man/Makefile.am	2009-05-09 13:04:06.000000000 +0200
+diff -ur globus_rls_client-5.2.orig/Doc/man/Makefile.am globus_rls_client-5.2/Doc/man/Makefile.am
+--- globus_rls_client-5.2.orig/Doc/man/Makefile.am	2002-12-12 02:47:06.000000000 +0100
++++ globus_rls_client-5.2/Doc/man/Makefile.am	2010-01-23 11:45:07.657532753 +0100
 @@ -1,7 +1,6 @@
  include $(top_srcdir)/globus_automake_pre
  
@@ -22,10 +10,10 @@ diff -ur globus_rls_client-5.1.orig/Doc/
 +	man1
  
  include $(top_srcdir)/globus_automake_post
-diff -ur globus_rls_client-5.1.orig/library/globus_rls_client.h globus_rls_client-5.1/library/globus_rls_client.h
---- globus_rls_client-5.1.orig/library/globus_rls_client.h	2006-01-19 21:27:16.000000000 +0100
-+++ globus_rls_client-5.1/library/globus_rls_client.h	2009-05-09 13:09:59.000000000 +0200
-@@ -1117,7 +1117,7 @@
+diff -ur globus_rls_client-5.2.orig/library/globus_rls_client.h globus_rls_client-5.2/library/globus_rls_client.h
+--- globus_rls_client-5.2.orig/library/globus_rls_client.h	2009-10-26 18:10:27.000000000 +0100
++++ globus_rls_client-5.2/library/globus_rls_client.h	2010-01-23 11:45:07.658533647 +0100
+@@ -1122,7 +1122,7 @@
   *	all results.
   *
   * @param str2_list
@@ -34,7 +22,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	globus_rls_string2_t structure.  <B>s1</B> will
   *	be the LFN, and <B>s2</B> the PFN it maps to.
   *
-@@ -1181,7 +1181,7 @@
+@@ -1186,7 +1186,7 @@
   *	all results.
   *
   * @param str2_list
@@ -43,7 +31,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	globus_rls_string2_t structure.  <B>s1</B> will
   *	be the LFN, and <B>s2</B> the PFN it maps to.
   *
-@@ -1218,7 +1218,7 @@
+@@ -1223,7 +1223,7 @@
   *	all results.
   *
   * @param str2_list
@@ -52,7 +40,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	globus_rls_string2_t structure.  <B>s1</B> will
   *	be the LFN, and <B>s2</B> the PFN it maps to.
   *
-@@ -1280,7 +1280,7 @@
+@@ -1285,7 +1285,7 @@
   *	all results.
   *
   * @param str2_list
@@ -61,7 +49,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	globus_rls_string2_t structure.  <B>s1</B> will
   *	be the LFN, and <B>s2</B> the PFN it maps to.
   *
-@@ -1481,8 +1481,8 @@
+@@ -1486,8 +1486,8 @@
   *
   * @param str2_list
   *	Results added to list.  Datums in @a str2_list are of type
@@ -72,7 +60,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	updates.  See @ref globus_rls_client_queryresult.
   *
   * @retval GLOBUS_SUCCESS
-@@ -1641,7 +1641,7 @@
+@@ -1646,7 +1646,7 @@
   *	all results.
   *
   * @param str2_list
@@ -81,7 +69,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	globus_rls_string2_t structure.  <B>s1</B> will
   *	be the LFN, and <B>s2</B> the LRC it maps to.  @a str2_list
   *	should be freed with globus_rls_client_free_list().
-@@ -1705,7 +1705,7 @@
+@@ -1710,7 +1710,7 @@
   *	all results.
   *
   * @param str2_list
@@ -90,7 +78,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	globus_rls_string2_t.  <B>s1</B> will
   *	be the LFN, and <B>s2</B> the LRC it maps to.  @a str2_list
   *	should be freed with globus_rls_client_free_list().
-@@ -1846,8 +1846,8 @@
+@@ -1851,8 +1851,8 @@
   *
   * @param str2_list
   *	Results added to list.  Datums in @a str2_list are of type
@@ -101,7 +89,7 @@ diff -ur globus_rls_client-5.1.orig/libr
   *	updates.  See @ref globus_rls_client_queryresult.
   *
   * @retval GLOBUS_SUCCESS
-@@ -2088,7 +2088,7 @@
+@@ -2098,7 +2098,7 @@
   *
   * @param r
   *	Result returned by RLS API function.  @a r is freed by this call

globus-rls-client-format.patch:
 rpc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: globus-rls-client-format.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-11/globus-rls-client-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rls-client-format.patch	1 Jun 2009 22:09:20 -0000	1.1
+++ globus-rls-client-format.patch	9 Feb 2010 08:54:00 -0000	1.2
@@ -1,13 +1,13 @@
-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-06-01 05:47:35.000000000 +0200
+diff -ur globus_rls_client-5.2.orig/library/rpc.c globus_rls_client-5.2/library/rpc.c
+--- globus_rls_client-5.2.orig/library/rpc.c	2009-10-22 02:00:26.000000000 +0200
++++ globus_rls_client-5.2/library/rpc.c	2010-01-27 11:05:58.038905559 +0100
 @@ -392,7 +392,8 @@
    if (rc != GLOBUS_RLS_SUCCESS)
      return rc;
    if (nb != b->len) {
--    sprintf(errmsg, "Attempted to write %d bytes, only wrote %d", b->len, nb);
-+    sprintf(errmsg, "Attempted to write %ld bytes, only wrote %ld",
-+            (long) b->len, (long) nb);
+-    sprintf(errmsg, "Attempted to write %lu bytes, only wrote %lu", b->len, nb);
++    sprintf(errmsg, "Attempted to write %lu bytes, only wrote %lu",
++	    (unsigned long)b->len, (unsigned long)nb);
      return GLOBUS_RLS_GLOBUSERR;
    }
    b->len = 0;


Index: globus-rls-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-11/globus-rls-client.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-rls-client.spec	25 Jul 2009 07:41:19 -0000	1.3
+++ globus-rls-client.spec	9 Feb 2010 08:54:00 -0000	1.4
@@ -6,36 +6,33 @@
 
 Name:		globus-rls-client
 %global _name %(tr - _ <<< %{name})
-Version:	5.1
-Release:	4%{?dist}
+Version:	5.2
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Client
 
 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/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/replica/rls/client globus_rls_client-5.1
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_client-5.1
-#		rm -rf globus_rls_client-5.1/java
-#		tar -zcf globus_rls_client-5.1.tar.gz globus_rls_client-5.1
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.0-all-source-installer.tar.bz2
+#		mv gt5.0.0-all-source-installer/source-trees/replica/rls/client globus_rls_client-5.2
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_client-5.2
+#		rm -rf globus_rls_client-5.2/java
+#		tar -zcf globus_rls_client-5.2.tar.gz globus_rls_client-5.2
 Source:		%{_name}-%{version}.tar.gz
 #		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
-#		Various dependency fixes:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6593
-Patch0:		%{name}.patch
 #		Fix some doxygen warnings:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6740
-Patch1:		%{name}-doxygen.patch
+Patch0:		%{name}-doxygen.patch
 #		Fix format errors:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6750
-Patch2:		%{name}-format.patch
+Patch1:		%{name}-format.patch
 #		Fixes for mingw compilation:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch3:		%{name}-mingw.patch
+Patch2:		%{name}-mingw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
@@ -119,7 +116,6 @@ Replica Location Service Client Document
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -233,6 +229,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.2-1
+- Update to Globus Toolkit 5.0.0
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.1-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 21:09:45 -0000	1.2
+++ import.log	9 Feb 2010 08:54:00 -0000	1.3
@@ -1,2 +1,3 @@
 globus-rls-client-5_1-2_fc9:F-11:globus-rls-client-5.1-2.fc9.src.rpm:1243894131
 globus-rls-client-5_1-3_fc9:F-11:globus-rls-client-5.1-3.fc9.src.rpm:1245100165
+globus-rls-client-5_2-1_fc12:F-11:globus-rls-client-5.2-1.fc12.src.rpm:1265705624


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jun 2009 22:09:21 -0000	1.2
+++ sources	9 Feb 2010 08:54:00 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-5f9581bed7d5fd64c4618ffccbb24dd5  globus_rls_client-5.1.tar.gz
+9c1f52e7bcaa7f9f029c626ed7d17a79  globus_rls_client-5.2.tar.gz


--- globus-rls-client.patch DELETED ---

