[globus-gridftp-server-control] Add README file Add missing dependencies

[Mattias Ellert]

commit ce67e87a6af3ee4fab36876ddd76b51a357b77e2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 01:04:37 2011 +0200

    Add README file
    Add missing dependencies

 GLOBUS-GRIDFTP                           |   22 ++++++++++++
 globus-gridftp-server-control-deps.patch |   56 ++++++++++++++++++++++++++++++
 globus-gridftp-server-control.spec       |   21 +++++++++++-
 3 files changed, 98 insertions(+), 1 deletions(-)
---
diff --git a/GLOBUS-GRIDFTP b/GLOBUS-GRIDFTP
new file mode 100644
index 0000000..99cac0a
--- /dev/null
+++ b/GLOBUS-GRIDFTP
@@ -0,0 +1,22 @@
+This package is part of the GridFTP component
+of the Globus Toolkit. For more information visit:
+
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/
+
+Admin Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/admin/
+
+Developer's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/developer/
+
+Release Notes:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/rn/
+
+Public Interface Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/pi/
+
+Quality Profile:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/qp/
+
+Migrating Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/gridftp/mig/
diff --git a/globus-gridftp-server-control-deps.patch b/globus-gridftp-server-control-deps.patch
new file mode 100644
index 0000000..1b1fa08
--- /dev/null
+++ b/globus-gridftp-server-control-deps.patch
@@ -0,0 +1,56 @@
+diff -ur globus_gridftp_server_control-0.45.orig/pkgdata/pkg_data_src.gpt.in globus_gridftp_server_control-0.45/pkgdata/pkg_data_src.gpt.in
+--- globus_gridftp_server_control-0.45.orig/pkgdata/pkg_data_src.gpt.in	2011-02-09 16:44:54.000000000 +0100
++++ globus_gridftp_server_control-0.45/pkgdata/pkg_data_src.gpt.in	2011-04-25 11:00:05.517339252 +0200
+@@ -14,9 +14,6 @@
+ 
+     <Source_Dependencies Type="compile" >
+       <Dependency Name="globus_common" > <Version > <Simple_Version Major="5" /> </Version> </Dependency>
+-    </Source_Dependencies>
+-
+-    <Source_Dependencies Type="compile" >
+       <Dependency Name="globus_xio" > <Version > <Simple_Version Major="0" /> </Version> </Dependency>
+             <Dependency Name="globus_xio_gsi_driver">
+                 <Version>
+@@ -28,9 +25,20 @@
+                     <Simple_Version Major="0"/>
+                 </Version>
+             </Dependency>
++            <Dependency Name="globus_gss_assist">
++                <Version>
++                    <Simple_Version Major="0"/>
++                </Version>
++            </Dependency>
++            <Dependency Name="globus_gssapi_error">
++                <Version>
++                    <Simple_Version Major="0"/>
++                </Version>
++            </Dependency>
+     </Source_Dependencies>
+ 
+     <Source_Dependencies Type="lib_link" >
++      <Dependency Name="globus_common" > <Version > <Simple_Version Major="5" /> </Version> </Dependency>
+       <Dependency Name="globus_xio" > <Version > <Simple_Version Major="0" /> </Version> </Dependency>
+             <Dependency Name="globus_xio_gsi_driver">
+                 <Version>
+@@ -42,11 +50,16 @@
+                     <Simple_Version Major="0"/>
+                 </Version>
+             </Dependency>
+-
+-    </Source_Dependencies>
+-
+-    <Source_Dependencies Type="lib_link" >
+-      <Dependency Name="globus_common" > <Version > <Simple_Version Major="5" /> </Version> </Dependency>
++            <Dependency Name="globus_gss_assist">
++                <Version>
++                    <Simple_Version Major="0"/>
++                </Version>
++            </Dependency>
++            <Dependency Name="globus_gssapi_error">
++                <Version>
++                    <Simple_Version Major="0"/>
++                </Version>
++            </Dependency>
+     </Source_Dependencies>
+ 
+     <Build_Environment >
diff --git a/globus-gridftp-server-control.spec b/globus-gridftp-server-control.spec
index fa4af4b..30a3936 100644
--- a/globus-gridftp-server-control.spec
+++ b/globus-gridftp-server-control.spec
@@ -7,7 +7,7 @@
 Name:		globus-gridftp-server-control
 %global _name %(tr - _ <<< %{name})
 Version:	0.45
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GridFTP Server Library
 
 Group:		System Environment/Libraries
@@ -20,9 +20,14 @@ URL:		http://www.globus.org/
 #		cp -p gt5.0.3-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.45
 #		tar -zcf globus_gridftp_server_control-0.45.tar.gz globus_gridftp_server_control-0.45
 Source:		%{_name}-%{version}.tar.gz
+#		README file
+Source8:	GLOBUS-GRIDFTP
 #		MAXPATHLENGTH should not be defined in installed headers:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
 Patch0:		%{name}.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-xio-pipe-driver%{?_isa}
@@ -31,6 +36,8 @@ BuildRequires:	grid-packaging-tools
 BuildRequires:	globus-xio-pipe-driver-devel%{?_isa}
 BuildRequires:	globus-common-devel%{?_isa} >= 5
 BuildRequires:	globus-xio-gsi-driver-devel%{?_isa}
+BuildRequires:	globus-gssapi-error-devel%{?_isa}
+BuildRequires:	globus-gss-assist-devel%{?_isa}
 BuildRequires:	globus-xio-devel%{?_isa}
 
 %package devel
@@ -40,6 +47,8 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	globus-xio-pipe-driver-devel%{?_isa}
 Requires:	globus-common-devel%{?_isa} >= 5
 Requires:	globus-xio-gsi-driver-devel%{?_isa}
+Requires:	globus-gssapi-error-devel%{?_isa}
+Requires:	globus-gss-assist-devel%{?_isa}
 Requires:	globus-xio-devel%{?_isa}
 
 %description
@@ -63,6 +72,7 @@ Globus GridFTP Server Library Development Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -110,6 +120,10 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 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
@@ -128,12 +142,17 @@ 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,-)
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.45-2
+- Add README file
+- Add missing dependencies
+
 * Fri Feb 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.45-1
 - Update to Globus Toolkit 5.0.3