rpms/globus-rsl/EL-4 .cvsignore, 1.2, 1.3 globus-rsl.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Tue Feb 9 08:45:49 UTC 2010
Author: ellert
Update of /cvs/pkgs/rpms/globus-rsl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25965/EL-4
Modified Files:
.cvsignore globus-rsl.spec import.log sources
Log Message:
* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.1-1
- Update to Globus Toolkit 5.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 22 Apr 2009 11:21:54 -0000 1.2
+++ .cvsignore 9 Feb 2010 08:45:49 -0000 1.3
@@ -1 +1,2 @@
-globus_rsl-5.0.tar.gz
+epstopdf-2.9.5gw
+globus_rsl-7.1.tar.gz
Index: globus-rsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/globus-rsl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-rsl.spec 25 Jul 2009 07:43:11 -0000 1.4
+++ globus-rsl.spec 9 Feb 2010 08:45:49 -0000 1.5
@@ -6,26 +6,40 @@
Name: globus-rsl
%global _name %(tr - _ <<< %{name})
-Version: 5.0
-Release: 5%{?dist}
+Version: 7.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Resource Specification Language 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/rsl/source globus_rsl-5.0
-# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-5.0
-# tar -zcf globus_rsl-5.0.tar.gz globus_rsl-5.0
+# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
+# tar -jxf gt5.0.0-all-source-installer.tar.bz2
+# mv gt5.0.0-all-source-installer/source-trees/gram/rsl/source globus_rsl-7.1
+# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl-7.1
+# tar -zcf globus_rsl-7.1.tar.gz globus_rsl-7.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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common
BuildRequires: grid-packaging-tools
BuildRequires: globus-common-devel%{?_isa} >= 3
BuildRequires: globus-core%{?_isa} >= 4
+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 - Resource Specification Language Library Development Files
@@ -34,6 +48,14 @@ Requires: %{name}%{?_isa} = %{version}-%
Requires: globus-common-devel%{?_isa} >= 3
Requires: globus-core%{?_isa} >= 4
+%package doc
+Summary: Globus Toolkit - Resource Specification Language 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
@@ -52,10 +74,28 @@ using the Globus Toolkit to unlock the p
The %{name}-devel package contains:
Resource Specification Language 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:
+Resource Specification Language Library Documentation Files
+
%prep
%setup -q -n %{_name}-%{version}
+%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
@@ -74,11 +114,15 @@ sed -e "s!<With_Flavors!<With_Flavors Co
%{_datadir}/globus/globus-bootstrap.sh
-%configure --with-flavor=%{flavor}
+%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
@@ -97,6 +141,17 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
%{_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}
@@ -106,6 +161,8 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}
| 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
@@ -124,7 +181,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
+%files -f package-doc.filelist doc
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}/html
+
%changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.1-1
+- Update to Globus Toolkit 5.0.0
+
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-5
- Add instruction set architecture (isa) tags
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 15 Jun 2009 20:47:23 -0000 1.3
+++ import.log 9 Feb 2010 08:45:49 -0000 1.4
@@ -1,3 +1,4 @@
globus-rsl-5_0-2_fc9:EL-4:globus-rsl-5.0-2.fc9.src.rpm:1240399238
globus-rsl-5_0-3_fc9:EL-4:globus-rsl-5.0-3.fc9.src.rpm:1240868816
globus-rsl-5_0-4_fc9:EL-4:globus-rsl-5.0-4.fc9.src.rpm:1245098823
+globus-rsl-7_1-1_fc12:EL-4:globus-rsl-7.1-1.fc12.src.rpm:1265705134
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 22 Apr 2009 11:21:54 -0000 1.2
+++ sources 9 Feb 2010 08:45:49 -0000 1.3
@@ -1 +1,2 @@
-10a41bb05089d24948341cf953ece353 globus_rsl-5.0.tar.gz
+44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
+a651d2cde4bddc00a1023ec6c28d89b7 globus_rsl-7.1.tar.gz
More information about the scm-commits
mailing list