rpms/globus-gram-client/EL-4 globus-gram-client-doxygen.patch, NONE, 1.1 globus-gram-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 Oct 19 18:12:12 UTC 2009


Author: ellert

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

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-client-doxygen.patch globus-gram-client.spec 
	import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


globus-gram-client-doxygen.patch:
 globus_gram_client_attr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gram-client-doxygen.patch ---
diff -ur globus_gram_client-7.2.orig/globus_gram_client_attr.c globus_gram_client-7.2/globus_gram_client_attr.c
--- globus_gram_client-7.2.orig/globus_gram_client_attr.c	2007-02-27 23:10:00.000000000 +0100
+++ globus_gram_client-7.2/globus_gram_client_attr.c	2009-08-06 07:16:34.370219417 +0200
@@ -191,7 +191,7 @@
  *
  * @param attr
  *     The attribute set to update.
- * @param credential
+ * @param mode
  *     The new value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR
@@ -230,7 +230,7 @@
  *
  * @param attr
  *     The attribute set to query.
- * @param credential
+ * @param mode
  *     Pointer to a location to set to the value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR


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

Name:		globus-gram-client
%global _name %(tr - _ <<< %{name})
Version:	7.2
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM 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/gram/client/source globus_gram_client-7.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client-7.2
#		tar -zcf globus_gram_client-7.2.tar.gz globus_gram_client-7.2
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
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6828
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 6
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-rsl-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	globus-gram-protocol-doc >= 3
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Client Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-gram-protocol-devel%{?_isa} >= 6
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-rsl-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Client Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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:
GRAM 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:
GRAM 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:
GRAM Client Library 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

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 $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 $GLOBUSPACKAGEDIR/%{_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 $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
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 $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_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
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-client-7_2-1_fc11:EL-4:globus-gram-client-7.2-1.fc11.src.rpm:1255975905


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:12:12 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_client-7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:25:41 -0000	1.1
+++ sources	19 Oct 2009 18:12:12 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+d40c311a8f878124f95602d8ab074658  globus_gram_client-7.2.tar.gz




More information about the fedora-extras-commits mailing list