rpms/globus-gass-transfer/F-10 globus-gass-transfer-doxygen.patch, NONE, 1.1 globus-gass-transfer.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mon Jun 1 05:29:19 UTC 2009

Author: ellert

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

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-transfer-doxygen.patch globus-gass-transfer.spec 
	import.log 
Log Message:
* 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
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball


globus-gass-transfer-doxygen.patch:

--- NEW FILE globus-gass-transfer-doxygen.patch ---
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
@@ -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
  *        may fail if the protocol does not support arbitrarily-length files.
- * @param callback
- *        Function to call once the URL has been accepted, referred, or
- *        denied by the server.
- * @param user_arg
- *        User-supplied argument to the callback function.
  *
  * @retval GLOBUS_SUCCESS
  *         The put was successfully initiated.
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 @@
  * 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.
  *
  * @param listener
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
@@ -627,9 +627,9 @@
  *
  * @param request
  *        The request to destroy.
- * @param GLOBUS_SUCCESS
+ * @retval GLOBUS_SUCCESS
  *        The request handle reference was successfully destroyed.
- * @param GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE
+ * @retval GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE
  *        Either an invalid request handle or one which is actively being
  *        used was passed to this function as the @a request parameter.
  */
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
@@ -302,6 +302,8 @@
  * @param request
  *        A pointer to a new request handle. This request handle will
  *        be initialized when the callback function is invoked.
+ * @param attr
+ *        Request attributes.
  * @param listener
  *        The listener handle to register for the new request.
  * @param callback


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

Name:		globus-gass-transfer
%global _name %(tr - _ <<< %{name})
Version:	3.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gass Transfer

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/gass/transfer/source globus_gass_transfer-3.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_transfer-3.4
#		tar -zcf globus_gass_transfer-3.4.tar.gz globus_gass_transfer-3.4
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=6591
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel >= 3
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
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - Globus Gass Transfer Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-common-devel >= 3
Requires:	globus-io-devel >= 3
Requires:	globus-gssapi-gsi-devel >= 4
Requires:	globus-core >= 4

%package doc
Summary:	Globus Toolkit - Globus Gass Transfer 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:
Globus Gass Transfer

%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:
Globus Gass Transfer 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:
Globus Gass Transfer Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -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/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> - 3.4-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.4-0.5
- Adapting to updated globus-core package

* 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
- Adapt to updated GPT package

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

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


--- NEW FILE import.log ---
globus-gass-transfer-3_4-1_fc9:F-10:globus-gass-transfer-3.4-1.fc9.src.rpm:1243834100


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-transfer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 May 2009 20:15:48 -0000	1.1
+++ .cvsignore	1 Jun 2009 05:28:48 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gass_transfer-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-transfer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 May 2009 20:15:49 -0000	1.1
+++ sources	1 Jun 2009 05:28:49 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+c772003eb628204259a1bb1ac1d79450  globus_gass_transfer-3.4.tar.gz


