rpms/globus-xio/devel globus-xio-doxygen.patch, 1.1, 1.2 globus-xio.spec, 1.5, 1.6 import.log, 1.4, 1.5 sources, 1.3, 1.4
Mattias Ellert
ellert at fedoraproject.org
Tue Feb 9 08:13:42 UTC 2010
Author: ellert
Update of /cvs/pkgs/rpms/globus-xio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13465/devel
Modified Files:
globus-xio-doxygen.patch globus-xio.spec import.log sources
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-2
- Update to Globus Toolkit 5.0.0
globus-xio-doxygen.patch:
builtins/http/globus_xio_http.h | 7 +++----
builtins/mode_e/globus_xio_mode_e_driver.h | 16 ++++++++--------
builtins/ordering/globus_xio_ordering_driver.h | 1 +
configure.in | 2 +-
configure.in.in | 2 +-
globus_xio.h | 2 +-
globus_xio_driver.h | 12 ++++++------
globus_xio_types.h | 3 ++-
8 files changed, 23 insertions(+), 22 deletions(-)
Index: globus-xio-doxygen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/globus-xio-doxygen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-xio-doxygen.patch 22 Apr 2009 09:27:50 -0000 1.1
+++ globus-xio-doxygen.patch 9 Feb 2010 08:13:42 -0000 1.2
@@ -1,6 +1,15 @@
-diff -ur globus_xio-2.7.orig/builtins/http/globus_xio_http.h globus_xio-2.7/builtins/http/globus_xio_http.h
---- globus_xio-2.7.orig/builtins/http/globus_xio_http.h 2008-04-30 20:25:27.000000000 +0200
-+++ globus_xio-2.7/builtins/http/globus_xio_http.h 2009-04-05 13:11:47.000000000 +0200
+diff -ur globus_xio-2.8.orig/builtins/http/globus_xio_http.h globus_xio-2.8/builtins/http/globus_xio_http.h
+--- globus_xio-2.8.orig/builtins/http/globus_xio_http.h 2008-04-30 20:25:27.000000000 +0200
++++ globus_xio-2.8/builtins/http/globus_xio_http.h 2010-01-22 23:18:47.089529969 +0100
+@@ -30,7 +30,7 @@
+ * @defgroup http_driver Globus XIO HTTP Driver
+ * This driver implements the HTTP/1.0 and HTTP/1.1 protocols within
+ * the Globus XIO framework. It may be used with the tcp driver for
+- * the standard HTTP protcol stack, or may be combined with the gsi
++ * the standard HTTP protocol stack, or may be combined with the gsi
+ * driver for a HTTPS implementation.
+ *
+ * This implementation supports user-defined HTTP headers, persistent
@@ -403,7 +403,7 @@
*/
/* int * status_code,
@@ -20,9 +29,9 @@ diff -ur globus_xio-2.7.orig/builtins/ht
*/
typedef enum
{
-diff -ur globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h
---- globus_xio-2.7.orig/builtins/mode_e/globus_xio_mode_e_driver.h 2006-04-21 21:10:39.000000000 +0200
-+++ globus_xio-2.7/builtins/mode_e/globus_xio_mode_e_driver.h 2009-04-05 13:05:14.000000000 +0200
+diff -ur globus_xio-2.8.orig/builtins/mode_e/globus_xio_mode_e_driver.h globus_xio-2.8/builtins/mode_e/globus_xio_mode_e_driver.h
+--- globus_xio-2.8.orig/builtins/mode_e/globus_xio_mode_e_driver.h 2006-04-21 21:10:39.000000000 +0200
++++ globus_xio-2.8/builtins/mode_e/globus_xio_mode_e_driver.h 2010-01-22 23:14:36.682532474 +0100
@@ -83,6 +83,7 @@
* @defgroup mode_e_driver_envs Env Variables
* @ingroup mode_e_driver
@@ -81,9 +90,9 @@ diff -ur globus_xio-2.7.orig/builtins/mo
GLOBUS_XIO_MODE_E_GET_STACK_ATTR
-diff -ur globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h
---- globus_xio-2.7.orig/builtins/ordering/globus_xio_ordering_driver.h 2006-08-22 16:00:30.000000000 +0200
-+++ globus_xio-2.7/builtins/ordering/globus_xio_ordering_driver.h 2009-04-05 13:05:02.000000000 +0200
+diff -ur globus_xio-2.8.orig/builtins/ordering/globus_xio_ordering_driver.h globus_xio-2.8/builtins/ordering/globus_xio_ordering_driver.h
+--- globus_xio-2.8.orig/builtins/ordering/globus_xio_ordering_driver.h 2006-08-22 16:00:30.000000000 +0200
++++ globus_xio-2.8/builtins/ordering/globus_xio_ordering_driver.h 2010-01-22 23:14:36.682532474 +0100
@@ -62,6 +62,7 @@
* @defgroup ordering_driver_envs Env Variables
* @ingroup ordering_driver
@@ -92,9 +101,9 @@ diff -ur globus_xio-2.7.orig/builtins/or
* - GLOBUS_XIO_ORDERING_DEBUG Available if using a debug build. See
* globus_debug.h for format.
*/
-diff -ur globus_xio-2.7.orig/configure.in globus_xio-2.7/configure.in
---- globus_xio-2.7.orig/configure.in 2008-10-03 07:13:03.000000000 +0200
-+++ globus_xio-2.7/configure.in 2009-04-05 13:11:47.000000000 +0200
+diff -ur globus_xio-2.8.orig/configure.in globus_xio-2.8/configure.in
+--- globus_xio-2.8.orig/configure.in 2010-01-18 16:46:18.000000000 +0100
++++ globus_xio-2.8/configure.in 2010-01-22 23:14:36.682532474 +0100
@@ -55,7 +55,7 @@
CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS",
@@ -104,9 +113,9 @@ diff -ur globus_xio-2.7.orig/configure.i
AM_CONFIG_HEADER(config.h)
AC_CHECK_FUNCS(sysconf)
-diff -ur globus_xio-2.7.orig/configure.in.in globus_xio-2.7/configure.in.in
---- globus_xio-2.7.orig/configure.in.in 2004-06-01 18:09:16.000000000 +0200
-+++ globus_xio-2.7/configure.in.in 2009-04-05 13:11:47.000000000 +0200
+diff -ur globus_xio-2.8.orig/configure.in.in globus_xio-2.8/configure.in.in
+--- globus_xio-2.8.orig/configure.in.in 2004-06-01 18:09:16.000000000 +0200
++++ globus_xio-2.8/configure.in.in 2010-01-22 23:14:36.682532474 +0100
@@ -55,7 +55,7 @@
CFLAGS="$CFLAGS -DGLOBUS_BUILTIN"
LAC_DOXYGEN("../ $XIO_BUILTIN_DOXY_DIRS",
@@ -116,9 +125,18 @@ diff -ur globus_xio-2.7.orig/configure.i
AM_CONFIG_HEADER(config.h)
AC_CHECK_FUNCS(sysconf)
-diff -ur globus_xio-2.7.orig/globus_xio_driver.h globus_xio-2.7/globus_xio_driver.h
---- globus_xio-2.7.orig/globus_xio_driver.h 2008-01-19 01:02:21.000000000 +0100
-+++ globus_xio-2.7/globus_xio_driver.h 2009-04-05 13:11:47.000000000 +0200
+diff -ur globus_xio-2.8.orig/globus_xio_driver.h globus_xio-2.8/globus_xio_driver.h
+--- globus_xio-2.8.orig/globus_xio_driver.h 2008-01-19 01:02:21.000000000 +0100
++++ globus_xio-2.8/globus_xio_driver.h 2010-01-22 23:16:05.344530468 +0100
+@@ -814,7 +814,7 @@
+ *
+ * This function will pass a close request down the driver stack. Upon
+ * completion of the close operation globus_xio will call the funciton
+- * pointed to by the cb arguement.
++ * pointed to by the cb argument.
+ *
+ * @param op
+ * The operation to pass along the driver stack for closing.
@@ -1396,11 +1396,11 @@
* many available parsing functions but the developer is free to right their own
* if the provided ones are not sufficient. Sample parsing functions follow:
@@ -136,9 +154,9 @@ diff -ur globus_xio-2.7.orig/globus_xio_
*
*/
/**
-diff -ur globus_xio-2.7.orig/globus_xio.h globus_xio-2.7/globus_xio.h
---- globus_xio-2.7.orig/globus_xio.h 2008-02-14 08:04:07.000000000 +0100
-+++ globus_xio-2.7/globus_xio.h 2009-04-05 13:11:47.000000000 +0200
+diff -ur globus_xio-2.8.orig/globus_xio.h globus_xio-2.8/globus_xio.h
+--- globus_xio-2.8.orig/globus_xio.h 2009-11-05 23:49:32.000000000 +0100
++++ globus_xio-2.8/globus_xio.h 2010-01-22 23:14:36.683532599 +0100
@@ -118,7 +118,7 @@
*/
@@ -148,12 +166,15 @@ diff -ur globus_xio-2.7.orig/globus_xio.
*
* \par Timeouts
* A user can set a timeout value for any io operation. Each IO
-diff -ur globus_xio-2.7.orig/globus_xio_types.h globus_xio-2.7/globus_xio_types.h
---- globus_xio-2.7.orig/globus_xio_types.h 2008-03-12 20:01:11.000000000 +0100
-+++ globus_xio-2.7/globus_xio_types.h 2009-04-05 13:11:47.000000000 +0200
-@@ -189,6 +189,7 @@
+diff -ur globus_xio-2.8.orig/globus_xio_types.h globus_xio-2.8/globus_xio_types.h
+--- globus_xio-2.8.orig/globus_xio_types.h 2008-03-12 20:01:11.000000000 +0100
++++ globus_xio-2.8/globus_xio_types.h 2010-01-22 23:15:25.878280089 +0100
+@@ -187,8 +187,9 @@
+ * @ingroup GLOBUS_XIO_API
+ *
* @param config_string
- * The driver specific paramter string.
+- * The driver specific paramter string.
++ * The driver specific parameter string.
*/
+ /* char * config_string */
GLOBUS_XIO_SET_STRING_OPTIONS
Index: globus-xio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/globus-xio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-xio.spec 3 Aug 2009 09:20:27 -0000 1.5
+++ globus-xio.spec 9 Feb 2010 08:13:42 -0000 1.6
@@ -7,13 +7,19 @@
Name: globus-xio
%global _name %(tr - _ <<< %{name})
Version: 2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus XIO Framework
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
-Source: http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
+# Source is extracted from the globus toolkit installer:
+# 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/xio/src globus_xio-2.8
+# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio-2.8
+# tar -zcf globus_xio-2.8.tar.gz globus_xio-2.8
+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
@@ -174,6 +180,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
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 $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
@@ -192,6 +202,8 @@ rm -rf $RPM_BUILD_ROOT
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
@@ -199,10 +211,12 @@ rm -rf $RPM_BUILD_ROOT
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-2
+- Update to Globus Toolkit 5.0.0
+
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-1
- Update to upstream update release 2.8
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 3 Aug 2009 09:20:27 -0000 1.4
+++ import.log 9 Feb 2010 08:13:42 -0000 1.5
@@ -2,3 +2,4 @@ globus-xio-2_7-2_fc9:HEAD:globus-xio-2.7
globus-xio-2_7-3_fc9:HEAD:globus-xio-2.7-3.fc9.src.rpm:1240867509
globus-xio-2_7-4_fc9:HEAD:globus-xio-2.7-4.fc9.src.rpm:1245088422
globus-xio-2_8-1_fc11:HEAD:globus-xio-2.8-1.fc11.src.rpm:1249291163
+globus-xio-2_8-2_fc12:HEAD:globus-xio-2.8-2.fc12.src.rpm:1265703207
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-xio/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 3 Aug 2009 09:20:27 -0000 1.3
+++ sources 9 Feb 2010 08:13:42 -0000 1.4
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-f7ab57f512f542c23a6425b2ede1050d globus_xio-2.8.tar.gz
+b53e6fdd8d3d9f2846f8ab60a7acba10 globus_xio-2.8.tar.gz
More information about the scm-commits
mailing list