rpms/globus-ftp-control/devel globus-ftp-control-doxygen.patch, NONE, 1.1 globus-ftp-control-format.patch, NONE, 1.1 globus-ftp-control-type-punned-pointer.patch, NONE, 1.1 globus-ftp-control.patch, NONE, 1.1 globus-ftp-control.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
Mon Jun 1 05:10:00 UTC 2009
- Previous message (by thread): rpms/epiphany/devel .cvsignore,1.80,1.81 sources,1.83,1.84
- Next message (by thread): rpms/globus-ftp-control/F-9 globus-ftp-control-doxygen.patch, NONE, 1.1 globus-ftp-control-format.patch, NONE, 1.1 globus-ftp-control-type-punned-pointer.patch, NONE, 1.1 globus-ftp-control.patch, NONE, 1.1 globus-ftp-control.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-ftp-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19257/devel
Modified Files:
.cvsignore sources
Added Files:
globus-ftp-control-doxygen.patch
globus-ftp-control-format.patch
globus-ftp-control-type-punned-pointer.patch
globus-ftp-control.patch globus-ftp-control.spec import.log
Log Message:
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.10-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-control-doxygen.patch:
--- NEW FILE globus-ftp-control-doxygen.patch ---
diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_data.c globus_ftp_control-2.10/globus_ftp_control_data.c
--- globus_ftp_control-2.10.orig/globus_ftp_control_data.c 2008-10-02 05:46:49.000000000 +0200
+++ globus_ftp_control-2.10/globus_ftp_control_data.c 2009-04-05 13:20:01.000000000 +0200
@@ -1000,6 +1000,13 @@
* @param handle
* A pointer to a FTP control handle which is configured to
* create an incoming data connection.
+ *
+ * @param callback
+ * This callback is called when the connection occurs. This
+ * parameter may be NULL.
+ *
+ * @param user_arg
+ * The user argument passed to the connect callback.
*/
globus_result_t
globus_ftp_control_data_connect_read(
@@ -1108,7 +1115,7 @@
* @param handle
* A pointer to a FTP control handle which is configured to
* create an outgoing data connection.
- * @param interface
+ * @param interface_addr
*
*/
globus_result_t
@@ -1192,13 +1199,6 @@
*
* @param user_arg
* The user argument passed to the connect callback.
- *
- * @param enqueue_func
- * The function used to break up data over the stripes. This
- * parameter is ignored when in stream mode.
- *
- * @param enqueue_arg
- * The user argument passed to the enqueue function.
*/
globus_result_t
globus_ftp_control_data_connect_write(
@@ -1804,7 +1804,7 @@
* store information about any channels added by this function.
* @param num_channels
* The number of additional channels to add.
- * @param stripe
+ * @param stripe_ndx
* A integer identifying the stripe to add channels too. In the
* case of non-striped transfer this parameter will be ignored.
*/
@@ -1880,6 +1880,7 @@
*
* @param array_size
* The number of elements in count[].
+ * @param eof_message
* @param cb
* The function to be called when the eof message has been called.
* @param user_arg
@@ -2143,7 +2144,7 @@
* update information about any channels removed by this function.
* @param num_channels
* The number of channels to remove.
- * @param stripe
+ * @param stripe_ndx
* A integer identifying the stripe to remove channels from. In the
* case of non-striped transfer this parameter will be ignored.
*/
@@ -2253,7 +2254,7 @@
* determine the host corresponding to "stripe" and number of
* channels corresponding to that host.
* @param num_channels
- * @param stripe
+ * @param stripe_ndx
* A integer identifying the stripe for which to return the
* number of channels. In the case of non-striped transfer this
* parameter should be zero.
@@ -2340,7 +2341,7 @@
* channels corresponding to that host.
* @param num_channels
*
- * @param stripe
+ * @param stripe_ndx
* A integer identifying the stripe for which to return the
* number of channels. In the case of non-striped transfer this
* parameter should be zero.
@@ -3436,13 +3437,13 @@
/**
- * Update the FTP control handle with the given socket buffer size
+ * Update the FTP control handle with the given socket buffer
* information.
*
* @param handle
* A pointer to the FTP control handle to be updated
- * @param buffer_size
- * Specifies the size of the socket buffer in bytes.
+ * @param tcp_buffer
+ * A pointer to the socket buffer.
*
*/
globus_result_t
@@ -3633,7 +3634,8 @@
* @param dcau
* A parameter specifying the data channel authentication
* mode. Possible values are No Authentication, Self
- * Authentication and Subject-name authentication. */
+ * Authentication and Subject-name authentication.
+ * @param delegated_credential_handle */
globus_result_t
globus_ftp_control_local_dcau(
globus_ftp_control_handle_t * handle,
@@ -5414,6 +5416,8 @@
* user calls globus_ftp_control_release_data_info(). The callback
* is passed all of the arguments passed to this function with the
* exception of data_info.
+ * @param callback_arg
+ * User supplied argument to the callback function
*/
globus_result_t
globus_ftp_control_create_data_info(
@@ -5605,11 +5609,10 @@
* @param stripe_ndx
* The index of the stripe on which the data will be sent. The index
* of each stripe is determined by the call to local_spas or local_spor.
- * @param data_info
- * In order to use this function the user must have a valid pointer
- * to a globus_ftp_control_data_write_info_t structure. The user should
- * call globus_ftp_control_create_data_info() to populate a valid
- * data_info structure.
+ * @param callback
+ * The function to be called once the data has been sent
+ * @param callback_arg
+ * User supplied argument to the callback function
*/
globus_result_t
globus_ftp_control_data_write_stripe(
diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_server.c globus_ftp_control-2.10/globus_ftp_control_server.c
--- globus_ftp_control-2.10.orig/globus_ftp_control_server.c 2008-10-02 05:46:49.000000000 +0200
+++ globus_ftp_control-2.10/globus_ftp_control_server.c 2009-04-05 13:20:01.000000000 +0200
@@ -792,7 +792,7 @@
* @param callback
* The user callback that will be called when the server
* structure is no longer listening.
- * @param callback
+ * @param callback_arg
* The user argument that is passed into callback.
*/
diff -ur globus_ftp_control-2.10.orig/globus_gridftp_protocol_extensions.doc globus_ftp_control-2.10/globus_gridftp_protocol_extensions.doc
--- globus_ftp_control-2.10.orig/globus_gridftp_protocol_extensions.doc 2002-04-15 09:02:09.000000000 +0200
+++ globus_ftp_control-2.10/globus_gridftp_protocol_extensions.doc 2009-04-05 13:23:19.000000000 +0200
@@ -1,8 +1,8 @@
/**
@anchor page_extensions
- at page extensions GridFTP: Protocol Extensions to FTP for the Grid
+ at page globus_ftp_extensions GridFTP: Protocol Extensions to FTP for the Grid
- at subsection extensions_intro Introduction
+ at section extensions_intro Introduction
<p>
This section defines extensions to the FTP specification STD 9, RFC
@@ -48,7 +48,7 @@
<p>
- at subsection term Terminology
+ at section term Terminology
@par Parallel transfer
From a single data server, splitting file data for transfer over multiple
@@ -71,7 +71,7 @@
The protocol interpreter. The user and server sides of the protocol
have distinct roles implemented in a user-PI and a server-PI.
- at subsection Existing FTP Standards Used
+ at section Existing FTP Standards Used
- RFC 959, @ref rfc959 "FILE TRANSFER PROTOCOL (FTP)", J. Postel,
R. Reynolds (October 1985)
@@ -135,7 +135,7 @@
- Restart of a stream mode transfer
@anchor sec_SPAS
- at subsection SPAS Striped Passive (SPAS)
+ at section SPAS Striped Passive (SPAS)
This extension is used to establish a vector of data socket listeners for for a
server with one or more stripes. This command MUST be used in conjunction with
@@ -177,7 +177,7 @@
OPTS command defined.
@anchor sec_SPOR
- at subsection SPOR Striped Data Port (SPOR)
+ at section SPOR Striped Data Port (SPOR)
This extension is to be used as a complement to the SPAS command to
implement striped third-party transfers. This command MUST always be used in
@@ -211,7 +211,7 @@
OPTS command defined.
@anchor sec_ERET
- at subsection ERET Extended Retrieve (ERET)
+ at section ERET Extended Retrieve (ERET)
The extended retrieve extension is used to request that a retrieve be
done with some additional processing on the server. This command an
@@ -254,7 +254,7 @@
<p>
@anchor sec_ESTO
- at subsection ESTO Extended Store (ESTO)
+ at section ESTO Extended Store (ESTO)
The extended store extension is used to request that a store be done with some
additional processing on the server. Arbitrary data processing algorithms may
@@ -290,7 +290,7 @@
<p>
@anchor sec_SBUF
- at subsection SBUF Set Buffer Size (SBUF)
+ at section SBUF Set Buffer Size (SBUF)
This extension adds the capability of a client to set the TCP buffer
size for subsequent data connections to a value. This replaces the
@@ -323,7 +323,7 @@
<p>
@anchor sec_DCAU
- at subsection DCAU Data Channel Authentication (DCAU)
+ at section DCAU Data Channel Authentication (DCAU)
This extension provides a method for specifying the type of
authentication to be performed on FTP data channels. This extension
@@ -366,7 +366,7 @@
If the security handshake fails, the server should return the error
response 432 (Data channel authentication failed).
- at subsection mode_e Extended Block Mode
+ at section mode_e Extended Block Mode
The striped and parallel data transfer methods described above require
an extended transfer mode to support out-of-sequence data delivery,
and partial data transmission per data connection. The extended block
@@ -587,7 +587,7 @@
at the given timestamp. The meaning of the facts are
- Timestamp - The time at which the server computed the performance
- information. This is in seconds since the epoch ((00:00:00 UTC, January 1,
+ information. This is in seconds since the epoch (00:00:00 UTC, January 1,
1970).
- Stripe Index - the index (0-number of stripes on the STOR side of the
transfer) which this marker pertains to.
@@ -605,7 +605,7 @@
'Stripe Bytes Transferred' set to the total transfer size for that stripe.
@anchor sec_OPTS
- at subsection opts Options to RETR
+ at section opts Options to RETR
The options described in this section provide a means to convey
striping and transfer parallelism information to the server-DTP. For
@@ -639,7 +639,7 @@
@par Partitioned
A partitioned data layout is one where the data is distributed evenly
-on the destination data nodes.Only one contiguous section of data
+on the destination data nodes. Only one contiguous section of data
is stored on each data node. A data node is defined here a single
host-port mentioned in the SPOR command
@@ -666,7 +666,7 @@
increase the number of parallel connections to per destination data
node to at most this value.
- at subsection refs References
+ at section refs References
@anchor rfc959 [1]
Postel, J. and Reynolds, J., "<a
@@ -689,7 +689,7 @@
href="http://www.ietf.org/internet-drafts/draft-ietf-ftpext-mlst-13.txt">
FTP Extensions</a>", IETF Draft, May 2001.
- at subsection appendix_i Appendix I: Implementation under GSI
+ at section appendix_i Appendix I: Implementation under GSI
<p>
There are several security components in this document which are extensions
globus-ftp-control-format.patch:
--- NEW FILE globus-ftp-control-format.patch ---
diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_data.c globus_ftp_control-2.10/globus_ftp_control_data.c
--- globus_ftp_control-2.10.orig/globus_ftp_control_data.c 2009-05-31 12:50:38.000000000 +0200
+++ globus_ftp_control-2.10/globus_ftp_control_data.c 2009-05-31 09:56:02.000000000 +0200
@@ -5210,8 +5210,8 @@
}
user_arg = GLOBUS_NULL;
- sprintf(strmsg, "StripedLayout=Blocked;BlockSize=%d;",
- layout->round_robin.block_size);
+ sprintf(strmsg, "StripedLayout=Blocked;BlockSize=%ld;",
+ (long) layout->round_robin.block_size);
}
else if(layout->mode == GLOBUS_FTP_CONTROL_STRIPING_PARTITIONED)
{
@@ -8408,8 +8408,8 @@
{
/* faking memory allocation */
char tag_str[128];
- sprintf(tag_str, "MODE=S TYPE=%c NBYTES=%d",
- dc_handle->type, nl_nbytes);
+ sprintf(tag_str, "MODE=S TYPE=%c NBYTES=%ld",
+ dc_handle->type, (long) nl_nbytes);
globus_netlogger_write(
&dc_handle->nl_ftp_handle,
GFTP_NL_EVENT_SENT_DATA,
@@ -8613,8 +8613,8 @@
if(dc_handle->nl_ftp_handle_set)
{
char tag_str[128];
- sprintf(tag_str, "MODE=S TYPE=%c NBYTES=%d",
- dc_handle->type, nl_nbytes);
+ sprintf(tag_str, "MODE=S TYPE=%c NBYTES=%ld",
+ dc_handle->type, (long) nl_nbytes);
globus_netlogger_write(
&dc_handle->nl_ftp_handle,
GFTP_NL_EVENT_RECEIVED_DATA,
@@ -9453,8 +9453,8 @@
if(dc_handle->nl_ftp_handle_set)
{
char tag_str[128];
- sprintf(tag_str, "MODE=E TYPE=%c NBYTES=%d",
- dc_handle->type, nl_bytes);
+ sprintf(tag_str, "MODE=E TYPE=%c NBYTES=%ld",
+ dc_handle->type, (long) nl_bytes);
globus_netlogger_write(
&dc_handle->nl_ftp_handle,
GFTP_NL_EVENT_RECEIVED_DATA,
@@ -9932,8 +9932,8 @@
{
/* faking memory allocation */
char tag_str[128];
- sprintf(tag_str, "MODE=E TYPE=%c NBYTES=%d",
- dc_handle->type, nl_bytes);
+ sprintf(tag_str, "MODE=E TYPE=%c NBYTES=%ld",
+ dc_handle->type, (long) nl_bytes);
globus_netlogger_write(
&dc_handle->nl_ftp_handle,
GFTP_NL_EVENT_SENT_DATA,
globus-ftp-control-type-punned-pointer.patch:
--- NEW FILE globus-ftp-control-type-punned-pointer.patch ---
diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_client.c globus_ftp_control-2.10/globus_ftp_control_client.c
--- globus_ftp_control-2.10.orig/globus_ftp_control_client.c 2008-10-02 05:46:49.000000000 +0200
+++ globus_ftp_control-2.10/globus_ftp_control_client.c 2008-12-31 14:44:24.000000000 +0100
@@ -1799,7 +1799,7 @@
rc=globus_i_ftp_control_encode_command(&(handle->cc_handle),
buf,
- (char **) &encode_buf);
+ (char **) (void *) &encode_buf);
globus_libc_free(buf);
@@ -4678,7 +4678,7 @@
result=globus_i_ftp_control_encode_command(
&handle->cc_handle,
write_buf,
- (char **) &element->write_buf);
+ (char **) (void *) &element->write_buf);
}
else
{
diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_server.c globus_ftp_control-2.10/globus_ftp_control_server.c
--- globus_ftp_control-2.10.orig/globus_ftp_control_server.c 2008-10-02 05:46:49.000000000 +0200
+++ globus_ftp_control-2.10/globus_ftp_control_server.c 2008-12-31 14:43:58.000000000 +0100
@@ -2681,7 +2681,7 @@
if(handle->cc_handle.auth_info.authenticated == GLOBUS_TRUE)
{
- rc=globus_i_ftp_control_encode_reply(buf,(char **) &encoded_buf,
+ rc=globus_i_ftp_control_encode_reply(buf,(char **) (void *) &encoded_buf,
&(handle->cc_handle.auth_info));
globus_libc_free(buf);
globus-ftp-control.patch:
--- NEW FILE globus-ftp-control.patch ---
diff -ur globus_ftp_control-2.10.orig/pkgdata/pkg_data_src.gpt.in globus_ftp_control-2.10/pkgdata/pkg_data_src.gpt.in
--- globus_ftp_control-2.10.orig/pkgdata/pkg_data_src.gpt.in 2008-09-18 21:46:09.000000000 +0200
+++ globus_ftp_control-2.10/pkgdata/pkg_data_src.gpt.in 2008-10-20 16:39:29.000000000 +0200
@@ -4,7 +4,7 @@
<gpt_package_metadata Format_Version="0.02" Name="globus_ftp_control" >
<Aging_Version Age="1" Major="2" Minor="10" />
- <Description >GridFTP Client Library</Description>
+ <Description >GridFTP Client Control Library</Description>
<Functional_Group >FileAccess</Functional_Group>
<Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@" />
--- NEW FILE globus-ftp-control.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif
Name: globus-ftp-control
%global _name %(tr - _ <<< %{name})
Version: 2.10
Release: 1%{?dist}
Summary: Globus Toolkit - GridFTP Client Control 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/control/source globus_ftp_control-2.10
# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_control-2.10
# tar -zcf globus_ftp_control-2.10.tar.gz globus_ftp_control-2.10
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
# Make package descriptions unique:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6589
Patch0: %{name}.patch
# Remove some doxygen warnings:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6590
Patch1: %{name}-doxygen.patch
# Dereferencing of type-punned pointers:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6603
Patch2: %{name}-type-punned-pointer.patch
# Fix format errors:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6749
Patch3: %{name}-format.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common
BuildRequires: grid-packaging-tools
BuildRequires: globus-common-devel >= 3
BuildRequires: globus-gss-assist-devel >= 3
BuildRequires: globus-io-devel >= 6
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
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
%endif
%endif
%package devel
Summary: Globus Toolkit - GridFTP Client Control Library Development Files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: globus-common-devel >= 3
Requires: globus-gss-assist-devel >= 3
Requires: globus-io-devel >= 6
Requires: globus-gssapi-gsi-devel >= 4
Requires: globus-core >= 4
%package doc
Summary: Globus Toolkit - GridFTP Client Control 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 Control 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 Control 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 Control Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -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
# Fix doxygen glitches
for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_control_client.c.3 \
$RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_extensions.3 ; do
sed 's/P\.RS/P\n.RS/' -i $f
done
# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
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
# 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> - 2.10-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> - 2.10-0.5
- Adapting to updated globus-core package
* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.10-0.4
- Add s390x to the list of 64 bit platforms
* Thu Jan 1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.10-0.3
- Adapt to updated GPT package
* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.10-0.2
- Update to Globus Toolkit 4.2.1
* Tue Jul 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-0.1
- Autogenerated
--- NEW FILE import.log ---
globus-ftp-control-2_10-1_fc9:HEAD:globus-ftp-control-2.10-1.fc9.src.rpm:1243832936
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 31 May 2009 20:15:03 -0000 1.1
+++ .cvsignore 1 Jun 2009 05:09:29 -0000 1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_ftp_control-2.10.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 31 May 2009 20:15:03 -0000 1.1
+++ sources 1 Jun 2009 05:09:29 -0000 1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
+f48e8e547f1257cc9fcd0e98018d2942 globus_ftp_control-2.10.tar.gz
- Previous message (by thread): rpms/epiphany/devel .cvsignore,1.80,1.81 sources,1.83,1.84
- Next message (by thread): rpms/globus-ftp-control/F-9 globus-ftp-control-doxygen.patch, NONE, 1.1 globus-ftp-control-format.patch, NONE, 1.1 globus-ftp-control-type-punned-pointer.patch, NONE, 1.1 globus-ftp-control.patch, NONE, 1.1 globus-ftp-control.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list