rpms/globus-gass-transfer/F-9 globus-gass-transfer-doxygen.patch, 1.1, 1.2 globus-gass-transfer.spec, 1.1, 1.2 import.log, 1.1, 1.2

Mattias Ellert ellert at fedoraproject.org
Mon Jun 15 19:54:11 UTC 2009 

Author: ellert

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

Modified Files:
	globus-gass-transfer-doxygen.patch globus-gass-transfer.spec 
	import.log 
Log Message:
* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-2
- Update to official Fedora Globus packaging guidelines


globus-gass-transfer-doxygen.patch:

Index: globus-gass-transfer-doxygen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-transfer/F-9/globus-gass-transfer-doxygen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gass-transfer-doxygen.patch	1 Jun 2009 05:27:04 -0000	1.1
+++ globus-gass-transfer-doxygen.patch	15 Jun 2009 19:53:41 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_client.c globus_gass_transfer-3.4/library/globus_gass_transfer_client.c
 --- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_client.c	2006-01-19 06:54:50.000000000 +0100
-+++ globus_gass_transfer-3.4/library/globus_gass_transfer_client.c	2008-10-21 19:58:16.000000000 +0200
++++ globus_gass_transfer-3.4/library/globus_gass_transfer_client.c	2009-06-14 09:26:35.000000000 +0200
 @@ -533,11 +533,6 @@
   *        The length of the data to append to the url, if known. If this
   *        parameter is set to @a GLOBUS_GASS_LENGTH_UNKNOWN, then the append
@@ -13,21 +13,158 @@ diff -ur globus_gass_transfer-3.4.orig/l
   *
   * @retval GLOBUS_SUCCESS
   *         The put was successfully initiated.
+diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer.h globus_gass_transfer-3.4/library/globus_gass_transfer.h
+--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer.h	2006-01-19 06:54:50.000000000 +0100
++++ globus_gass_transfer-3.4/library/globus_gass_transfer.h	2009-06-14 09:39:51.000000000 +0200
+@@ -47,8 +47,8 @@
+  * simple protocol-independent API.
+  *
+  * The GASS Transfer API provides a way to implement both
+- * @link globus_gass_transfer_client client @endlink and
+- * @link globus_gass_transfer_server server @endlink
++ * @link globus_gass_transfer_client client at endlink and
++ * @link globus_gass_transfer_server server at endlink
+  * components. These share common data block and request management
+  * functionality. Client-specific functions are provided to implement file
+  * "get", "put", and "append" operations. Server-specific functions are
+@@ -62,7 +62,7 @@
+  * server-side support for the http and https protocols. 
+  * An application which requires additional
+  * protocol support may add this through the @link
+- * globus_gass_transfer_protocol protocol module interface @endlink.
++ * globus_gass_transfer_protocol protocol module interface at endlink.
+  *
+  * The GASS Transfer API is defined in the header file
+  * "globus_gass_transfer.h"
+@@ -122,9 +122,9 @@
+  * For server operations, the request is initialized by calling
+  * globus_gass_transfer_accept().
+  *
+- * The functions in the @link globus_gass_transfer_request request section
+- * @endlink of this manual describe the functions available for accessing
+- * information from a request handle.
++ * The functions in the @link globus_gass_transfer_request request
++ * section at endlink of this manual describe the functions available for
++ * accessing information from a request handle.
+  *
+  * Each request handle should be destroyed by calling
+  * globus_gass_transfer_request_destroy() once the user has completed
+@@ -340,7 +340,7 @@
+  * file transfers. The operations supported by the GASS Transfer API
+  * are file get, put, and append. These operations are provided for
+  * HTTP, and HTTPS file servers. The @link
+- * globus_gass_transfer_protocol protocol module interface @endlink
++ * globus_gass_transfer_protocol protocol module interface at endlink
+  * allows support for additional protocols to be added
+  * easily.
+  *
 diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.c globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c
 --- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.c	2006-01-19 06:54:50.000000000 +0100
-+++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c	2008-10-21 20:11:45.000000000 +0200
-@@ -151,7 +151,7 @@
++++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c	2009-06-14 09:36:49.000000000 +0200
+@@ -150,9 +150,9 @@
+  * This function notifies the GASS Transfer Library that the protocol module
   * has decided that a new request can be accepted on this particular listener.
   * It must only be called after the GASS Transfer Library has called the
-  * @link globus_gass_transfer_listener_proto_t::listen listen function @endlink
-- * in a @link #globus_gass_transfer_listener_proto_t protocol module-specific
-+ * in a #globus_gass_transfer_listener_proto_t protocol module-specific
-  * listener structure.
+- * @link globus_gass_transfer_listener_proto_t::listen listen function @endlink
++ * @link globus_gass_transfer_listener_proto_s::listen listen function at endlink
+  * in a @link #globus_gass_transfer_listener_proto_t protocol module-specific
+- * listener structure.
++ * listener structure at endlink.
   *
   * @param listener
+  *        The listener handle which is now ready for accepting a new
+diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.h globus_gass_transfer-3.4/library/globus_gass_transfer_proto.h
+--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.h	2006-01-19 06:54:50.000000000 +0100
++++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.h	2009-06-14 10:14:51.000000000 +0200
+@@ -65,8 +65,8 @@
+  * must be called after the #GLOBUS_GASS_TRANSFER_MODULE has already been
+  * activated. Once registered, applications may use URLs of the scheme type
+  * provided by the protocol module for the standard @link
+- * globus_gass_transfer_client client @endlink or @link
+- * globus_gass_transfer_server server @endlink operations.
++ * globus_gass_transfer_client client at endlink or @link
++ * globus_gass_transfer_server server at endlink operations.
+  */
+ 
+ #ifndef GLOBUS_GASS_INCLUDE_GLOBUS_GASS_PROTO_H
+@@ -88,9 +88,17 @@
+ EXTERN_C_BEGIN
+ 
+ /* Module-specific types */
++/**
++ * Protocol module request handling structure.
++ * @ingroup globus_gass_transfer_protocol
++ * @see #globus_gass_transfer_request_proto_s */
+ typedef struct globus_gass_transfer_request_proto_s
+ globus_gass_transfer_request_proto_t;
+ 
++/**
++ * Protocol module listener handling structure.
++ * @ingroup globus_gass_transfer_protocol
++ * @see #globus_gass_transfer_listener_proto_s */
+ typedef struct globus_gass_transfer_listener_proto_s
+ globus_gass_transfer_listener_proto_t;
+ 
+@@ -223,7 +231,7 @@
+  *        A protocol-specific attribute set, created by calling the
+  *        protocol module's
+  *        @link globus_gass_transfer_proto_descriptor_t::new_requestattr
+- *        new_requestattr function pointer @endlink.
++ *        new_requestattr function pointer at endlink.
+  */
+ typedef void
+ (* globus_gass_transfer_proto_new_request_t)(
+@@ -246,7 +254,7 @@
+  *        A protocol-specific attribute set, created by calling the
+  *        protocol module's
+  *        @link globus_gass_transfer_proto_descriptor_t::new_listenerattr
+- *        new_listenerattr function pointer @endlink.
++ *        new_listenerattr function pointer at endlink.
+  * @param scheme
+  *        The URL scheme that the server has requested for the new listener.
+  *        This will be one the scheme associated with a particular
+@@ -368,16 +376,16 @@
+     globus_gass_transfer_requestattr_t *	attr);
+ 
+ /**
+- * @struct globus_gass_transfer_request_proto_t
++ * @struct globus_gass_transfer_request_proto_s
+  * Protocol module request handling structure.
+  * @ingroup globus_gass_transfer_protocol
+  *
+  * This structure is created by a GASS transfer protocol module to
+  * handle a particular request. It is created in response to a
+- * @link globus_gass_transfer_listener_proto_t::accept
+- * listener's accept method @endlink or a @link
++ * @link globus_gass_transfer_listener_proto_s::accept
++ * listener's accept method at endlink or a @link
+  * globus_gass_transfer_proto_descriptor_t::new_request
+- * protocol module's new_request method @endlink.
++ * protocol module's new_request method at endlink.
+  *
+  * Memory management of this structure is the responsibility of the protocol
+  * module. The destroy method will be called when the GASS Transfer library
+@@ -431,7 +439,7 @@
+ };
+ 
+ /**
+- * @struct globus_gass_transfer_listener_proto_t
++ * @struct globus_gass_transfer_listener_proto_s
+  * Protocol module listener handling structure.
+  * @ingroup globus_gass_transfer_protocol
+  */
 diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_request.c globus_gass_transfer-3.4/library/globus_gass_transfer_request.c
 --- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_request.c	2006-01-19 06:54:50.000000000 +0100
-+++ globus_gass_transfer-3.4/library/globus_gass_transfer_request.c	2008-10-21 20:09:08.000000000 +0200
++++ globus_gass_transfer-3.4/library/globus_gass_transfer_request.c	2009-06-14 09:38:41.000000000 +0200
+@@ -41,7 +41,7 @@
+  * @param request
+  *        The request to query.
+  *
+- * @return The @link #globus_gass_transfer_request_type_t type @endlink
++ * @return The @link #globus_gass_transfer_request_type_t type at endlink
+  * of the request.
+  */
+ globus_gass_transfer_request_type_t
 @@ -627,9 +627,9 @@
   *
   * @param request
@@ -42,7 +179,7 @@ diff -ur globus_gass_transfer-3.4.orig/l
   */
 diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_server.c globus_gass_transfer-3.4/library/globus_gass_transfer_server.c
 --- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_server.c	2006-01-19 06:54:50.000000000 +0100
-+++ globus_gass_transfer-3.4/library/globus_gass_transfer_server.c	2008-10-21 20:06:45.000000000 +0200
++++ globus_gass_transfer-3.4/library/globus_gass_transfer_server.c	2009-06-14 09:26:35.000000000 +0200
 @@ -302,6 +302,8 @@
   * @param request
   *        A pointer to a new request handle. This request handle will


Index: globus-gass-transfer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-transfer/F-9/globus-gass-transfer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gass-transfer.spec	1 Jun 2009 05:27:04 -0000	1.1
+++ globus-gass-transfer.spec	15 Jun 2009 19:53:41 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-gass-transfer
 %global _name %(tr - _ <<< %{name})
 Version:	3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus Gass Transfer
 
 Group:		System Environment/Libraries
@@ -35,18 +35,11 @@ BuildRequires:	globus-io-devel >= 3
 BuildRequires:	globus-gssapi-gsi-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
@@ -142,15 +135,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
@@ -161,25 +154,23 @@ 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
 
-# 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
@@ -204,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-2
+- Update to official Fedora Globus packaging guidelines
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-1
 - Make comment about source retrieval more explicit
 - Change defines to globals
@@ -216,7 +210,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-0.4
 - Add s390x to the list of 64 bit platforms
 
-* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-0.3
 - Adapt to updated GPT package
 
 * Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-0.2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-transfer/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 05:27:04 -0000	1.1
+++ import.log	15 Jun 2009 19:53:41 -0000	1.2
@@ -1 +1,2 @@
 globus-gass-transfer-3_4-1_fc9:F-9:globus-gass-transfer-3.4-1.fc9.src.rpm:1243833995
+globus-gass-transfer-3_4-2_fc9:F-9:globus-gass-transfer-3.4-2.fc9.src.rpm:1245095600

More information about the fedora-extras-commits mailing list