rpms/globus-rls-client/F-10 globus-rls-client-doxygen.patch, NONE, 1.1 globus-rls-client-format.patch, NONE, 1.1 globus-rls-client.patch, NONE, 1.1 globus-rls-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
Mon Jun 1 22:07:50 UTC 2009


Author: ellert

Update of /cvs/pkgs/rpms/globus-rls-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20535/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	globus-rls-client-doxygen.patch globus-rls-client-format.patch 
	globus-rls-client.patch globus-rls-client.spec import.log 
Log Message:
* Mon Jun 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-2
- Fix documentation build


globus-rls-client-doxygen.patch:

--- NEW FILE globus-rls-client-doxygen.patch ---
diff -ur globus_rls_client-5.1.orig/configure.in globus_rls_client-5.1/configure.in
--- globus_rls_client-5.1.orig/configure.in	2009-05-09 09:35:21.000000000 +0200
+++ globus_rls_client-5.1/configure.in	2009-05-09 13:04:06.000000000 +0200
@@ -12,7 +12,7 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION)
 
-LAC_DOXYGEN([" ../ "])
+LAC_DOXYGEN(["../library"])
 
 GLOBUS_FINALIZE
 
diff -ur globus_rls_client-5.1.orig/Doc/man/Makefile.am globus_rls_client-5.1/Doc/man/Makefile.am
--- globus_rls_client-5.1.orig/Doc/man/Makefile.am	2002-12-12 02:47:06.000000000 +0100
+++ globus_rls_client-5.1/Doc/man/Makefile.am	2009-05-09 13:04:06.000000000 +0200
@@ -1,7 +1,6 @@
 include $(top_srcdir)/globus_automake_pre
 
 SUBDIRS= \
-	man1 \
-	man3
+	man1
 
 include $(top_srcdir)/globus_automake_post
diff -ur globus_rls_client-5.1.orig/library/globus_rls_client.h globus_rls_client-5.1/library/globus_rls_client.h
--- globus_rls_client-5.1.orig/library/globus_rls_client.h	2006-01-19 21:27:16.000000000 +0100
+++ globus_rls_client-5.1/library/globus_rls_client.h	2009-05-09 13:09:59.000000000 +0200
@@ -1117,7 +1117,7 @@
  *	all results.
  *
  * @param str2_list
- *	List of LFNs that map to @pfn.  Each list datum will be a
+ *	List of LFNs that map to @a pfn.  Each list datum will be a
  *	globus_rls_string2_t structure.  <B>s1</B> will
  *	be the LFN, and <B>s2</B> the PFN it maps to.
  *
@@ -1181,7 +1181,7 @@
  *	all results.
  *
  * @param str2_list
- *	List of LFNs that map to @pfn_pattern.  Each list datum will be a
+ *	List of LFNs that map to @a pfn_pattern.  Each list datum will be a
  *	globus_rls_string2_t structure.  <B>s1</B> will
  *	be the LFN, and <B>s2</B> the PFN it maps to.
  *
@@ -1218,7 +1218,7 @@
  *	all results.
  *
  * @param str2_list
- *	List of PFNs that map to @lfn.  Each list datum will be a
+ *	List of PFNs that map to @a lfn.  Each list datum will be a
  *	globus_rls_string2_t structure.  <B>s1</B> will
  *	be the LFN, and <B>s2</B> the PFN it maps to.
  *
@@ -1280,7 +1280,7 @@
  *	all results.
  *
  * @param str2_list
- *	List of PFNs that map to @lfn_pattern.  Each list datum will be a
+ *	List of PFNs that map to @a lfn_pattern.  Each list datum will be a
  *	globus_rls_string2_t structure.  <B>s1</B> will
  *	be the LFN, and <B>s2</B> the PFN it maps to.
  *
@@ -1481,8 +1481,8 @@
  *
  * @param str2_list
  *	Results added to list.  Datums in @a str2_list are of type
- *	globus_rls_string2_t structure.  <B>s1<B> will be the rli url,
- *	<B>s2<B> an  empty string or the pattern used to partition
+ *	globus_rls_string2_t structure.  <B>s1</B> will be the rli url,
+ *	<B>s2</B> an  empty string or the pattern used to partition
  *	updates.  See @ref globus_rls_client_queryresult.
  *
  * @retval GLOBUS_SUCCESS
@@ -1641,7 +1641,7 @@
  *	all results.
  *
  * @param str2_list
- *	List of LRCs that @lfn maps to.  Each list datum will be a
+ *	List of LRCs that @a lfn maps to.  Each list datum will be a
  *	globus_rls_string2_t structure.  <B>s1</B> will
  *	be the LFN, and <B>s2</B> the LRC it maps to.  @a str2_list
  *	should be freed with globus_rls_client_free_list().
@@ -1705,7 +1705,7 @@
  *	all results.
  *
  * @param str2_list
- *	List of LRCs that map to @lfn_pattern.  Each list datum will be a
+ *	List of LRCs that map to @a lfn_pattern.  Each list datum will be a
  *	globus_rls_string2_t.  <B>s1</B> will
  *	be the LFN, and <B>s2</B> the LRC it maps to.  @a str2_list
  *	should be freed with globus_rls_client_free_list().
@@ -1846,8 +1846,8 @@
  *
  * @param str2_list
  *	Results added to list.  Datums in @a str2_list are of type
- *	globus_rls_string2_t structure.  <B>s1<B> will be the rli url,
- *	<B>s2<B> an  empty string or the pattern used to partition
+ *	globus_rls_string2_t structure.  <B>s1</B> will be the rli url,
+ *	<B>s2</B> an  empty string or the pattern used to partition
  *	updates.  See @ref globus_rls_client_queryresult.
  *
  * @retval GLOBUS_SUCCESS
@@ -2088,7 +2088,7 @@
  *
  * @param r
  *	Result returned by RLS API function.  @a r is freed by this call
- *	and should not be referenced again.  If @preserve is set then a
+ *	and should not be referenced again.  If @a preserve is set then a
  *	new globus_result_t is constructed with the same values and
  *	returned as the function value.
  *

globus-rls-client-format.patch:

--- NEW FILE globus-rls-client-format.patch ---
diff -ur globus_rls_client-5.1.orig/library/rpc.c globus_rls_client-5.1/library/rpc.c
--- globus_rls_client-5.1.orig/library/rpc.c	2006-06-01 02:37:03.000000000 +0200
+++ globus_rls_client-5.1/library/rpc.c	2009-06-01 05:47:35.000000000 +0200
@@ -392,7 +392,8 @@
   if (rc != GLOBUS_RLS_SUCCESS)
     return rc;
   if (nb != b->len) {
-    sprintf(errmsg, "Attempted to write %d bytes, only wrote %d", b->len, nb);
+    sprintf(errmsg, "Attempted to write %ld bytes, only wrote %ld",
+            (long) b->len, (long) nb);
     return GLOBUS_RLS_GLOBUSERR;
   }
   b->len = 0;

globus-rls-client.patch:

--- NEW FILE globus-rls-client.patch ---
diff -ur globus_rls_client-5.1.orig/configure.in globus_rls_client-5.1/configure.in
--- globus_rls_client-5.1.orig/configure.in	2008-04-01 01:30:26.000000000 +0200
+++ globus_rls_client-5.1/configure.in	2008-10-25 14:45:09.000000000 +0200
@@ -3,13 +3,6 @@
 AC_REVISION($Revision: 1.7 $)
 AC_INIT(Makefile.am)
 
-if test "x$GLOBUS_LOCATION" = "x"; then
-    echo "ERROR Please specify GLOBUS_LOCATION" >&2
-    exit 1
-fi
-
-AC_SUBST(GLOBUS_LOCATION)
-
 GLOBUS_INIT
 
 AM_PROG_LIBTOOL
diff -ur globus_rls_client-5.1.orig/pkgdata/pkg_data_src.gpt.in globus_rls_client-5.1/pkgdata/pkg_data_src.gpt.in
--- globus_rls_client-5.1.orig/pkgdata/pkg_data_src.gpt.in	2008-05-29 00:31:39.000000000 +0200
+++ globus_rls_client-5.1/pkgdata/pkg_data_src.gpt.in	2008-10-25 14:45:39.000000000 +0200
@@ -3,9 +3,7 @@
 
 <gpt_package_metadata Name="globus_rls_client" Format_Version="0.02">
     <Aging_Version Major="5" Minor="1" Age="0"/>
-    <Description>
-        The C client library and globus-rls-cli command-line client for Globus RLS
-    </Description>
+    <Description>Replica Location Service Client</Description>
     <Functional_Group>Data</Functional_Group>
     <Version_Stability Release="Production"/>
 
@@ -23,14 +21,23 @@
         </Source_Dependencies>
 
         <Source_Dependencies Type="lib_link">
-            <Dependency Name="globus_core">
+            <Dependency Name="globus_common">
+                <Version><Simple_Version Major="3"/></Version></Dependency>
+            <Dependency Name="globus_io">
+                <Version><Simple_Version Major="3"/></Version></Dependency>
+            <Dependency Name="globus_gssapi_gsi">
                 <Version><Simple_Version Major="4"/></Version></Dependency>
+        </Source_Dependencies>
+
+        <Source_Dependencies Type="pgm_link">
             <Dependency Name="globus_common">
                 <Version><Simple_Version Major="3"/></Version></Dependency>
             <Dependency Name="globus_io">
                 <Version><Simple_Version Major="3"/></Version></Dependency>
             <Dependency Name="globus_gssapi_gsi">
                 <Version><Simple_Version Major="4"/></Version></Dependency>
+            <Dependency Name="globus_rls_client">
+                <Version><Simple_Version Major="5"/></Version></Dependency>
         </Source_Dependencies>
 
         <With_Flavors build="yes"/>


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

Name:		globus-rls-client
%global _name %(tr - _ <<< %{name})
Version:	5.1
Release:	2%{?dist}
Summary:	Globus Toolkit - Replica Location Service Client

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/replica/rls/client globus_rls_client-5.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_client-5.1
#		rm -rf globus_rls_client-5.1/java
#		tar -zcf globus_rls_client-5.1.tar.gz globus_rls_client-5.1
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
#		Various dependency fixes:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6593
Patch0:		%{name}.patch
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6740
Patch1:		%{name}-doxygen.patch
#		Fix format errors:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6750
Patch2:		%{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-gssapi-gsi-devel >= 4
BuildRequires:	globus-io-devel >= 3
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 progs
Summary:	Globus Toolkit - Replica Location Service Client Programs
Group:		Applications/Internet
Requires:	%{name} = %{version}-%{release}

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

%package doc
Summary:	Globus Toolkit - Replica Location Service Client 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:
Replica Location Service Client

%description progs
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}-progs package contains:
Replica Location Service Client Programs

%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:
Replica Location Service Client 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:
Replica Location Service Client 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 client man page to progs package
grep globus-rls-cli.1 \
  $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  >> $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist
sed /globus-rls-cli.1/d \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# 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}_pgm.filelist \
  | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.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-progs.filelist progs
%defattr(-,root,root,-)

%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
* Mon Jun 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-2
- Fix documentation build

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.1-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> - 5.1-0.5
- Adapting to updated globus-core package

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

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

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

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


--- NEW FILE import.log ---
globus-rls-client-5_1-2_fc9:F-10:globus-rls-client-5.1-2.fc9.src.rpm:1243894009


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	1 Jun 2009 21:33:33 -0000	1.1
+++ .cvsignore	1 Jun 2009 22:07:19 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_rls_client-5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-client/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	1 Jun 2009 21:33:33 -0000	1.1
+++ sources	1 Jun 2009 22:07:20 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+5f9581bed7d5fd64c4618ffccbb24dd5  globus_rls_client-5.1.tar.gz




More information about the fedora-extras-commits mailing list