[globus-rsl-assist] Add README file Add missing dependencies

[Mattias Ellert]

commit 3e8c37d2c3faaed4af8dbc2b771cf264daf8da90
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 00:55:07 2011 +0200

    Add README file
    Add missing dependencies

 GLOBUS-GRAM5                 |   22 ++++++++++++++++++++++
 globus-rsl-assist-deps.patch |   16 ++++++++++++++++
 globus-rsl-assist.spec       |   19 +++++++++++++++++--
 3 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/GLOBUS-GRAM5 b/GLOBUS-GRAM5
new file mode 100644
index 0000000..44a32f6
--- /dev/null
+++ b/GLOBUS-GRAM5
@@ -0,0 +1,22 @@
+This package is part of the GRAM5 component
+of the Globus Toolkit. For more information visit:
+
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/
+
+Admin Guide:
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/admin/
+
+Developer's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/developer/
+
+Release Notes:
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/rn/
+
+Public Interface Guide:
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/pi/
+
+Quality Profile:
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/qp/
+
+Migrating Guide:
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/mig/
diff --git a/globus-rsl-assist-deps.patch b/globus-rsl-assist-deps.patch
new file mode 100644
index 0000000..8d9927f
--- /dev/null
+++ b/globus-rsl-assist-deps.patch
@@ -0,0 +1,16 @@
+diff -ur globus_rsl_assist-2.2.orig/pkgdata/pkg_data_src.gpt.in globus_rsl_assist-2.2/pkgdata/pkg_data_src.gpt.in
+--- globus_rsl_assist-2.2.orig/pkgdata/pkg_data_src.gpt.in	2010-05-21 15:51:29.000000000 +0200
++++ globus_rsl_assist-2.2/pkgdata/pkg_data_src.gpt.in	2011-04-25 08:51:20.505900844 +0200
+@@ -14,10 +14,12 @@
+ 
+     <Source_Dependencies Type="compile" >
+       <Dependency Name="globus_core" > <Version > <Simple_Version Major="4" /> </Version> </Dependency>
++      <Dependency Name="globus_common" > <Version > <Simple_Version Major="0" /> </Version> </Dependency>
+       <Dependency Name="globus_rsl" > <Version > <Simple_Version Major="2" /> </Version> </Dependency>
+     </Source_Dependencies>
+ 
+     <Source_Dependencies Type="lib_link" >
++      <Dependency Name="globus_common" > <Version > <Simple_Version Major="0" /> </Version> </Dependency>
+       <Dependency Name="globus_rsl" > <Version > <Simple_Version Major="2" /> </Version> </Dependency>
+     </Source_Dependencies>
+ 
diff --git a/globus-rsl-assist.spec b/globus-rsl-assist.spec
index fc043cc..dfe16f2 100644
--- a/globus-rsl-assist.spec
+++ b/globus-rsl-assist.spec
@@ -7,7 +7,7 @@
 Name:		globus-rsl-assist
 %global _name %(tr - _ <<< %{name})
 Version:	2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - RSL Manipulation Library
 
 Group:		System Environment/Libraries
@@ -20,12 +20,17 @@ URL:		http://www.globus.org/
 #		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
+#		README file
+Source8:	GLOBUS-GRAM5
 #		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
+#		Missing direct dependencies:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
+Patch1:		%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
@@ -38,7 +43,7 @@ BuildRequires:	graphviz
 BuildRequires:	graphviz-gd
 %endif
 BuildRequires:	ghostscript
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	tex(latex)
 %else
 BuildRequires:	tetex-latex
@@ -89,6 +94,7 @@ RSL Manipulation Library Documentation Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -160,6 +166,10 @@ sed -e '/_%{_name}-%{version}_.*\.3/d' \
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+# Install README file
+install -m 644 -p %{SOURCE8} \
+  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -180,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
@@ -190,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-3
+- Add README file
+- Add missing dependencies
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild