rpms/globus-ftp-client/EL-4 globus-ftp-client-doxygen.patch, NONE, 1.1 globus-ftp-client-format.patch, NONE, 1.1 globus-ftp-client-type-punned-pointer.patch, NONE, 1.1 globus-ftp-client.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mattias Ellert ellert at fedoraproject.org
Thu Jun 4 04:05:05 UTC 2009


Author: ellert

Update of /cvs/pkgs/rpms/globus-ftp-client/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22795/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-ftp-client-doxygen.patch globus-ftp-client-format.patch 
	globus-ftp-client-type-punned-pointer.patch 
	globus-ftp-client.spec import.log 
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-ftp-client-doxygen.patch:

--- NEW FILE globus-ftp-client-doxygen.patch ---
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_attr.c globus_ftp_client-3.14/globus_ftp_client_attr.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_attr.c	2008-04-04 03:51:47.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_attr.c	2009-04-05 12:52:43.000000000 +0200
@@ -359,7 +359,7 @@
  *
  * @param attr
  *        Attribute to modify
- * @param gridftp
+ * @param gridftp2
  *        Set to GLOBUS_TRUE to enable GridFTP2 support.
  *        Default of GLOBUS_FALSE specifies that GridFTP is disabled.
  */
@@ -1841,7 +1841,7 @@
  *
  * @param attr
  *        The attribute set to query or modify.
- * @param buffer
+ * @param tcp_buffer
  *        The value of tcp_buffer attribute.
  *
  * @see #globus_gsiftp_control_tcpbuffer_t
@@ -1939,7 +1939,7 @@
  *
  * @param attr
  *        The attribute set to query or modify.
- * @param buffer
+ * @param type
  *        The value of type attribute.
  *
  * @see #globus_ftp_control_type_t
@@ -2035,7 +2035,7 @@
  *
  * @param attr
  *        The attribute set to query or modify.
- * @param layout
+ * @param mode
  *        The value of mode attribute
  *
  * @see #globus_ftp_control_mode_t,
@@ -2124,7 +2124,9 @@
     return globus_error_put(err);
 }
 /* globus_ftp_client_operationattr_get_mode() */
+/* @} */
 
+/* @{ */
 /**
  * Set/Get whether or not list data will use the current data mode
  * @ingroup globus_ftp_client_operationattr
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_data.c globus_ftp_client-3.14/globus_ftp_client_data.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_data.c	2008-04-04 03:51:47.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_data.c	2009-04-05 12:52:43.000000000 +0200
@@ -330,6 +330,7 @@
  *        mode, the data does not need to be sent in order. In stream
  *	  mode (the default), data must be sent in sequential
  *	  order. The behavior is undefined if multiple writes overlap.
+ * @param eof
  * @param callback
  *        The function to be called once the data has been written.
  * @param callback_arg
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_debug_plugin.c globus_ftp_client-3.14/globus_ftp_client_debug_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_debug_plugin.c	2009-04-05 12:52:11.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_debug_plugin.c	2009-04-05 12:52:43.000000000 +0200
@@ -1199,6 +1199,8 @@
  *        A pointer to an uninitialized plugin. The plugin will be
  *        configured as a debugging plugin, with the default of sending
  *        debugging messages to stderr.
+ * @param stream
+ * @param text
  *
  * @return This function returns an error if
  * - plugin is null
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_plugin.c globus_ftp_client-3.14/globus_ftp_client_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_plugin.c	2006-10-14 09:21:56.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_plugin.c	2009-04-05 12:52:43.000000000 +0200
@@ -81,12 +81,12 @@
  *
  * @param handle
  *        The handle which is associated with the list.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original list's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original list's attribute set.
  * @param when
@@ -143,12 +143,12 @@
  *
  * @param handle
  *        The handle which is associated with the list.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original list's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original list's attribute set.
  * @param when
@@ -206,12 +206,12 @@
  *
  * @param handle
  *        The handle which is associated with the list.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original list's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original list's attribute set.
  * @param when
@@ -268,12 +268,12 @@
  *
  * @param handle
  *        The handle which is associated with the list.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original list's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original list's attribute set.
  * @param when
@@ -330,12 +330,12 @@
  *
  * @param handle
  *        The handle which is associated with the list.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original list's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original list's attribute set.
  * @param when
@@ -537,12 +537,12 @@
  *
  * @param handle
  *        The handle which is associated with the delete.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original delete's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original delete's attribute set.
  * @param when
@@ -599,12 +599,12 @@
  *
  * @param handle
  *        The handle which is associated with the feat.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original feat's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original feat's attribute set.
  * @param when
@@ -661,12 +661,12 @@
  *
  * @param handle
  *        The handle which is associated with the mkdir.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original mkdir's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original mkdir's attribute set.
  * @param when
@@ -723,12 +723,12 @@
  *
  * @param handle
  *        The handle which is associated with the rmdir.
- * @param source_url
+ * @param url
  *        The destination URL of the transfer. This may be different than
  *        the original rmdir's URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new transfer. This may be a
  *        modified version of the original rmdir's attribute set.
  * @param when
@@ -1101,12 +1101,12 @@
  *
  * @param handle
  *        The handle which is associated with the operation.
- * @param source_url
+ * @param url
  *        The source URL of the size check. This may be different than
  *        the original operations URL, if the plugin decides to redirect to
  *        another FTP server due to performance or reliability
  *        problems with the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new operation. This may be a
  *        modified version of the original operations's attribute set.
  * @param when
@@ -1161,12 +1161,12 @@
  *
  * @param handle
  *        The handle which is associated with the operation.
- * @param source_url
+ * @param url
  *        The source URL of the modification time check. This may be different
  *        than the original operations URL, if the plugin decides to redirect
  *        to another FTP server due to performance or reliability problems with
  *        the original URL.
- * @param source_attr
+ * @param attr
  *        The attributes to use for the new operation. This may be a
  *        modified version of the original operations's attribute set.
  * @param when
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_plugin.h globus_ftp_client-3.14/globus_ftp_client_plugin.h
--- globus_ftp_client-3.14.orig/globus_ftp_client_plugin.h	2008-04-04 03:51:47.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_plugin.h	2009-04-05 12:54:46.000000000 +0200
@@ -947,7 +947,7 @@
  * @ingroup globus_ftp_client_plugins
  *
  * This callback is used to notify a plugin that a FTP control
- * command is being sent.The client library will only call this
+ * command is being sent. The client library will only call this
  * function for response callbacks associated with a command which is
  * in the plugin's command mask, and associated with one of the other
  * ftp operations with a defined callback in the plugin.
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.c globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.c	2009-04-05 12:52:11.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.c	2009-04-05 12:52:43.000000000 +0200
@@ -526,6 +526,8 @@
  * provides by using this function to set these callbacks.  Note that
  * the callbacks are defined the same as in the throughput plugin
  *
+ * @param plugin
+ *
  * @param begin_cb
  *        the callback to be called upon the start of a transfer
  *
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.h globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.h
--- globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.h	2006-01-19 06:54:53.000000000 +0100
+++ globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.h	2009-04-05 12:45:48.000000000 +0200
@@ -39,32 +39,32 @@
  * TransferPerfTotal : This event type will be sent everytime a throughput
  *      plugin total callback is received.
  *
- * URL.SOURCE   <string>  Source url of transfer
- * URL.DEST     <string>  Dest url of transfer
- * BYTES        <int>     Total bytes transfered thus far
- * BW.CURRENT   <float>   Current (instantaneous) bandwidth
- * BW.AVG       <float>   Average (instantaneous) bandwidth
+ * - URL.SOURCE   <string>  Source url of transfer
+ * - URL.DEST     <string>  Dest url of transfer
+ * - BYTES        <int>     Total bytes transfered thus far
+ * - BW.CURRENT   <float>   Current (instantaneous) bandwidth
+ * - BW.AVG       <float>   Average (instantaneous) bandwidth
  *
  * TransferPerfStripe  : This event type will be sent everytime a throughput
  *      plugin stripe callback is received.
  *
- * URL.SOURCE   <string>  Source url of transfer
- * URL.DEST     <string>  Dest url of transfer
- * INDEX        <int>     The stripe index the event applies to
- * BYTES        <int>     Total bytes transfered thus far on this stripe
- * BW.CURRENT   <float>   Current (instantaneous) bandwidth on this stripe
- * BW.AVG       <float>   Average (instantaneous) bandwidth on this stripe
+ * - URL.SOURCE   <string>  Source url of transfer
+ * - URL.DEST     <string>  Dest url of transfer
+ * - INDEX        <int>     The stripe index the event applies to
+ * - BYTES        <int>     Total bytes transfered thus far on this stripe
+ * - BW.CURRENT   <float>   Current (instantaneous) bandwidth on this stripe
+ * - BW.AVG       <float>   Average (instantaneous) bandwidth on this stripe
  *
  * TransferBegin  : This event type will be sent everytime a throughput
  *      plugin begin callback is received.
  *
- * URL.SOURCE   <string>  Source url of transfer
- * URL.DEST     <string>  Dest url of transfer
+ * - URL.SOURCE   <string>  Source url of transfer
+ * - URL.DEST     <string>  Dest url of transfer
  *
  * TransferEnd  : This event type will be sent everytime a throughput
  *      plugin complete callback is received.
  *
- * SUCCESS      <bool>    Completion status
+ * - SUCCESS      <bool>    Completion status
  *
  */
 
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_transfer.c globus_ftp_client-3.14/globus_ftp_client_transfer.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_transfer.c	2008-10-02 05:46:48.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_transfer.c	2009-04-05 12:52:43.000000000 +0200
@@ -2089,7 +2089,7 @@
  * aborted, the complete_callback will be invoked with the final
  * status of the get.
  *
- * @param u_handle
+ * @param handle
  *        An FTP Client handle to use for the get operation.
  * @param url
  *	  The URL to download. The URL may be an ftp or gsiftp URL.
@@ -2799,6 +2799,7 @@
  *	  Attributes for this file transfer.
  * @param restart
  *        Pointer to a restart marker.
+ * @param esto_alg_str
  * @param complete_callback
  *        Callback to be invoked once the "put" is completed.
  * @param callback_arg
@@ -3346,11 +3347,13 @@
  *	  The URL to transfer. The URL may be an ftp or gsiftp URL.
  * @param source_attr
  *	  Attributes for the souce URL.
+ * @param eret_alg_str
  * @param dest_url
  *        The destination URL for the transfer. The URL may be an ftp
  *        or gsiftp URL.
  * @param dest_attr
  *        Attributes for the destination URL.
+ * @param esto_alg_str
  * @param restart
  *        Pointer to a restart marker.
  * @param complete_callback

globus-ftp-client-format.patch:

--- NEW FILE globus-ftp-client-format.patch ---
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_restart_marker.c globus_ftp_client-3.14/globus_ftp_client_restart_marker.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_restart_marker.c	2008-10-02 05:46:48.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_restart_marker.c	2009-06-04 05:32:21.000000000 +0200
@@ -666,7 +666,7 @@
 {
     globus_off_t				offset;
     globus_off_t				end;
-    globus_size_t				consumed;
+    int						consumed;
     globus_object_t *				err;
     globus_result_t				res;
     const char *				p;

globus-ftp-client-type-punned-pointer.patch:

--- NEW FILE globus-ftp-client-type-punned-pointer.patch ---
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_debug_plugin.c globus_ftp_client-3.14/globus_ftp_client_debug_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_debug_plugin.c	2007-06-01 19:23:06.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_debug_plugin.c	2008-12-30 19:53:32.000000000 +0100
@@ -1329,7 +1329,7 @@
     GLOBUS_L_FTP_CLIENT_DEBUG_PLUGIN_RETURN(plugin);
 
     result = globus_ftp_client_plugin_get_plugin_specific(plugin,
-	                                                  (void **) &d);
+	                                                  (void **) (void *) &d);
     if(result != GLOBUS_SUCCESS)
     {
 	return result;
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_perf_plugin.c globus_ftp_client-3.14/globus_ftp_client_perf_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_perf_plugin.c	2006-01-19 06:54:53.000000000 +0100
+++ globus_ftp_client-3.14/globus_ftp_client_perf_plugin.c	2008-12-30 19:53:32.000000000 +0100
@@ -720,7 +720,7 @@
 
     result = globus_ftp_client_plugin_get_plugin_specific(
               plugin,
-              (void **) &ps);
+              (void **) (void *) &ps);
 
     if(result != GLOBUS_SUCCESS)
     {
@@ -767,7 +767,7 @@
 
     result = globus_ftp_client_plugin_get_plugin_specific(
         plugin,
-        (void **) &ps);
+        (void **) (void *) &ps);
 
     if(result != GLOBUS_SUCCESS)
     {
@@ -827,7 +827,7 @@
 
     result = globus_ftp_client_plugin_get_plugin_specific(
         plugin,
-        (void **) &ps);
+        (void **) (void *) &ps);
 
     if(result != GLOBUS_SUCCESS)
     {
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_restart_marker_plugin.c globus_ftp_client-3.14/globus_ftp_client_restart_marker_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_restart_marker_plugin.c	2006-01-19 06:54:53.000000000 +0100
+++ globus_ftp_client-3.14/globus_ftp_client_restart_marker_plugin.c	2008-12-30 19:53:32.000000000 +0100
@@ -722,7 +722,7 @@
 
     result = globus_ftp_client_plugin_get_plugin_specific(
         plugin,
-        (void **) &ps);
+        (void **) (void *) &ps);
 
     if(result != GLOBUS_SUCCESS)
     {
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_restart_plugin.c globus_ftp_client-3.14/globus_ftp_client_restart_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_restart_plugin.c	2008-09-18 10:52:41.000000000 +0200
+++ globus_ftp_client-3.14/globus_ftp_client_restart_plugin.c	2008-12-30 19:53:32.000000000 +0100
@@ -396,7 +396,7 @@
 	goto free_exit;
     }
     result = globus_ftp_client_plugin_get_plugin_specific(newguy,
-	                                                  (void **) &newd);
+	                                                  (void **) (void *) &newd);
     if(result != GLOBUS_SUCCESS)
     {
 	goto destroy_exit;
@@ -1234,7 +1234,7 @@
     globus_result_t                     result;
 
     result = globus_ftp_client_plugin_get_plugin_specific(
-        plugin, (void **) &d);
+        plugin, (void **) (void *) &d);
     if(result != GLOBUS_SUCCESS)
     {
         return result;
@@ -1455,7 +1455,7 @@
     GLOBUS_L_FTP_CLIENT_RESTART_PLUGIN_RETURN(plugin);
 
     result = globus_ftp_client_plugin_get_plugin_specific(plugin,
-	                                                  (void **) &d);
+	                                                  (void **) (void *) &d);
     if(result != GLOBUS_SUCCESS)
     {
         return result;
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.c globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.c	2006-01-19 06:54:53.000000000 +0100
+++ globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.c	2008-12-30 19:53:32.000000000 +0100
@@ -339,7 +339,7 @@
     {
         globus_ftp_client_throughput_plugin_get_user_specific(
             plugin,
-            (void **) &info);
+            (void **) (void *) &info);
         info->destroy_handle = GLOBUS_TRUE;
     }
     else
@@ -494,7 +494,7 @@
 
     result = globus_ftp_client_throughput_plugin_get_user_specific(
               plugin,
-              (void **) &info);
+              (void **) (void *) &info);
 
     if(result != GLOBUS_SUCCESS)
     {
@@ -576,7 +576,7 @@
 
     result = globus_ftp_client_throughput_plugin_get_user_specific(
               plugin,
-              (void **) &info);
+              (void **) (void *) &info);
 
     if(result != GLOBUS_SUCCESS)
     {
diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_throughput_plugin.c globus_ftp_client-3.14/globus_ftp_client_throughput_plugin.c
--- globus_ftp_client-3.14.orig/globus_ftp_client_throughput_plugin.c	2006-01-19 06:54:53.000000000 +0100
+++ globus_ftp_client-3.14/globus_ftp_client_throughput_plugin.c	2008-12-30 19:53:32.000000000 +0100
@@ -635,7 +635,7 @@
 
     result = globus_ftp_client_perf_plugin_get_user_specific(
               plugin,
-              (void **) &info);
+              (void **) (void *) &info);
 
     if(result != GLOBUS_SUCCESS)
     {
@@ -682,7 +682,7 @@
 
     result = globus_ftp_client_perf_plugin_get_user_specific(
               plugin,
-              (void **) &info);
+              (void **) (void *) &info);
 
     if(result != GLOBUS_SUCCESS)
     {
@@ -749,7 +749,7 @@
 
     result = globus_ftp_client_perf_plugin_get_user_specific(
         plugin,
-        (void **) &info);
+        (void **) (void *) &info);
 
     if(result != GLOBUS_SUCCESS)
     {


--- NEW FILE globus-ftp-client.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-ftp-client
%global _name %(tr - _ <<< %{name})
Version:	3.14
Release:	1%{?dist}
Summary:	Globus Toolkit - GridFTP Client Library

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/gridftp/client/source globus_ftp_client-3.14
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_client-3.14
#		tar -zcf globus_ftp_client-3.14.tar.gz globus_ftp_client-3.14
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
#		Remove some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6600
Patch0:		%{name}-doxygen.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6602
Patch1:		%{name}-type-punned-pointer.patch
#		Fix format errors:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6752
Patch2:		%{name}-format.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-xio-popen-driver
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-popen-driver-devel
BuildRequires:	globus-common-devel >= 4
BuildRequires:	globus-ftp-control-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	globus-ftp-control-doc >= 1
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
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - GridFTP Client Library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-xio-popen-driver-devel
Requires:	globus-common-devel >= 4
Requires:	globus-ftp-control-devel >= 1
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - GridFTP Client Library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GridFTP Client Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
GridFTP Client Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GridFTP Client Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# 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

# 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

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# 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

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/bug.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/bug\.3/d' \
    -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_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 \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%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,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-0.3
- Adapt to updated GPT package

* Tue Oct 21 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-0.2
- Update to Globus Toolkit 4.2.1

* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.11-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-ftp-client-3_14-1_fc9:EL-4:globus-ftp-client-3.14-1.fc9.src.rpm:1244088245


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Jun 2009 16:54:35 -0000	1.1
+++ .cvsignore	4 Jun 2009 04:04:35 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_ftp_client-3.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Jun 2009 16:54:35 -0000	1.1
+++ sources	4 Jun 2009 04:04:35 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+74293005cf65816798e503e4c2e6566d  globus_ftp_client-3.14.tar.gz




More information about the fedora-extras-commits mailing list