rpms/globus-rsl-assist/EL-6 globus-rsl-assist-doxygen.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-rsl-assist.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.3, 1.4

Sat Jul 17 17:48:17 UTC 2010

Author: ellert

Update of /cvs/pkgs/rpms/globus-rsl-assist/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23815/EL-6

Modified Files:
	.cvsignore globus-rsl-assist.spec import.log sources 
Added Files:
	globus-rsl-assist-doxygen.patch 
Log Message:
* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Update to Globus Toolkit 5.0.2


globus-rsl-assist-doxygen.patch:
 globus_rsl_assist.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE globus-rsl-assist-doxygen.patch ---
diff -ur globus_rsl_assist-2.2.orig/globus_rsl_assist.c globus_rsl_assist-2.2/globus_rsl_assist.c
--- globus_rsl_assist-2.2.orig/globus_rsl_assist.c	2010-05-21 15:51:28.000000000 +0200
+++ globus_rsl_assist-2.2/globus_rsl_assist.c	2010-07-17 10:48:23.965554458 +0200
@@ -28,7 +28,7 @@
  *   RSL parse trees or strings.
  */
 
-/**
+/*
  * @file globus_rsl_assist.c RSL Help Functions
  *
  * CVS Information:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Apr 2009 22:41:53 -0000	1.2
+++ .cvsignore	17 Jul 2010 17:48:17 -0000	1.3
@@ -1 +1,2 @@
-globus_rsl_assist-2.1.tar.gz
+epstopdf-2.9.5gw
+globus_rsl_assist-2.2.tar.gz


Index: globus-rsl-assist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-6/globus-rsl-assist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-rsl-assist.spec	9 Feb 2010 08:47:04 -0000	1.4
+++ globus-rsl-assist.spec	17 Jul 2010 17:48:17 -0000	1.5
@@ -6,26 +6,43 @@
 
 Name:		globus-rsl-assist
 %global _name %(tr - _ <<< %{name})
-Version:	2.1
-Release:	4%{?dist}
+Version:	2.2
+Release:	1%{?dist}
 Summary:	Globus Toolkit - RSL Manipulation 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/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_assist/source globus_rsl_assist-2.1
-#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.1
-#		tar -zcf globus_rsl_assist-2.1.tar.gz globus_rsl_assist-2.1
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.2/installers/src/gt5.0.2-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.2-all-source-installer.tar.bz2
+#		mv gt5.0.2-all-source-installer/source-trees/gram/rsl_assist/source globus_rsl_assist-2.2
+#		cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rsl_assist-2.2
+#		tar -zcf globus_rsl_assist-2.2.tar.gz globus_rsl_assist-2.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
+#		Workaround a bug in doxygen 1.6.0 and later:
+#		https://bugzilla.gnome.org/show_bug.cgi?id=593759
+Patch0:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
 BuildRequires:	grid-packaging-tools
 BuildRequires:	globus-rsl-devel%{?_isa} >= 2
 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 - RSL Manipulation Library Development Files
@@ -34,6 +51,14 @@ Requires:	%{name}%{?_isa} = %{version}-%
 Requires:	globus-rsl-devel%{?_isa} >= 2
 Requires:	globus-core%{?_isa} >= 4
 
+%package doc
+Summary:	Globus Toolkit - RSL Manipulation 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 +77,29 @@ using the Globus Toolkit to unlock the p
 The %{name}-devel package contains:
 RSL Manipulation 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:
+RSL Manipulation 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
@@ -74,11 +118,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 +145,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 +165,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 +185,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 Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
+- Update to Globus Toolkit 5.0.2
+
 * Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-4
 - Update to Globus Toolkit 5.0.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-6/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Feb 2010 08:47:04 -0000	1.3
+++ import.log	17 Jul 2010 17:48:17 -0000	1.4
@@ -1,3 +1,4 @@
 globus-rsl-assist-2_1-1_fc9:HEAD:globus-rsl-assist-2.1-1.fc9.src.rpm:1240872080
 globus-rsl-assist-2_1-2_fc9:HEAD:globus-rsl-assist-2.1-2.fc9.src.rpm:1245098991
 globus-rsl-assist-2_1-4_fc12:F-12:globus-rsl-assist-2.1-4.fc12.src.rpm:1265705210
+globus-rsl-assist-2_2-1_fc12:EL-6:globus-rsl-assist-2.2-1.fc12.src.rpm:1279388881


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rsl-assist/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Feb 2010 08:47:04 -0000	1.3
+++ sources	17 Jul 2010 17:48:17 -0000	1.4
@@ -1 +1,2 @@
-4d4eaa50da5b18707cfe5e2789b5fdda  globus_rsl_assist-2.1.tar.gz
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+0573984bbf7fafe3d1992b9d635f2570  globus_rsl_assist-2.2.tar.gz

