[globus-usage] Add README file Add missing dependencies

[Mattias Ellert]

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

    Add README file
    Add missing dependencies

 GLOBUS-CCOMMONLIB       |   22 ++++++++++++++++++++++
 globus-usage-deps.patch |   27 +++++++++++++++++++++++++++
 globus-usage.spec       |   19 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 1 deletions(-)
---
diff --git a/GLOBUS-CCOMMONLIB b/GLOBUS-CCOMMONLIB
new file mode 100644
index 0000000..b9cbdac
--- /dev/null
+++ b/GLOBUS-CCOMMONLIB
@@ -0,0 +1,22 @@
+This package is part of the C Common Libraries component
+of the Globus Toolkit. For more information visit:
+
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/
+
+Admin Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/admin/
+
+Developer's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/developer/
+
+Release Notes:
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/rn/
+
+Public Interface Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/pi/
+
+Quality Profile:
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/qp/
+
+Migrating Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/ccommonlib/mig/
diff --git a/globus-usage-deps.patch b/globus-usage-deps.patch
new file mode 100644
index 0000000..da92d15
--- /dev/null
+++ b/globus-usage-deps.patch
@@ -0,0 +1,27 @@
+diff -ur globus_usage-1.4.orig/pkgdata/pkg_data_src.gpt.in globus_usage-1.4/pkgdata/pkg_data_src.gpt.in
+--- globus_usage-1.4.orig/pkgdata/pkg_data_src.gpt.in	2010-07-23 18:50:00.000000000 +0200
++++ globus_usage-1.4/pkgdata/pkg_data_src.gpt.in	2011-04-25 09:12:08.918177549 +0200
+@@ -16,6 +16,11 @@
+                     <Simple_Version Major="4"/>
+                 </Version>
+             </Dependency>
++            <Dependency Name="globus_common">
++                <Version>
++                    <Simple_Version Major="0"/>
++                </Version>
++            </Dependency>
+             <Dependency Name="globus_xio">
+                 <Version>
+                     <Simple_Version Major="0"/>
+@@ -23,6 +28,11 @@
+             </Dependency>
+         </Source_Dependencies>
+         <Source_Dependencies Type="lib_link">
++            <Dependency Name="globus_common">
++                <Version>
++                    <Simple_Version Major="0"/>
++                </Version>
++            </Dependency>
+             <Dependency Name="globus_xio">
+                 <Version>
+                     <Simple_Version Major="0"/>
diff --git a/globus-usage.spec b/globus-usage.spec
index 449cb47..01d95bc 100644
--- a/globus-usage.spec
+++ b/globus-usage.spec
@@ -7,7 +7,7 @@
 Name:		globus-usage
 %global _name %(tr - _ <<< %{name})
 Version:	1.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Usage Library
 
 Group:		System Environment/Libraries
@@ -20,10 +20,16 @@ URL:		http://www.globus.org/
 #		cp -p gt5.0.3-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_usage-1.4
 #		tar -zcf globus_usage-1.4.tar.gz globus_usage-1.4
 Source:		%{_name}-%{version}.tar.gz
+#		README file
+Source8:	GLOBUS-CCOMMONLIB
+#		Missing direct dependencies:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
+Patch0:		%{name}-deps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
 BuildRequires:	grid-packaging-tools
+BuildRequires:	globus-common-devel%{?_isa}
 BuildRequires:	globus-xio-devel%{?_isa}
 BuildRequires:	globus-core%{?_isa} >= 4
 
@@ -31,6 +37,7 @@ BuildRequires:	globus-core%{?_isa} >= 4
 Summary:	Globus Toolkit - Usage Library Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-common-devel%{?_isa}
 Requires:	globus-xio-devel%{?_isa}
 Requires:	globus-core%{?_isa} >= 4
 
@@ -55,6 +62,7 @@ Usage Library Development Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -102,6 +110,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
@@ -120,12 +132,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> - 1.4-2
+- Add README file
+- Add missing dependencies
+
 * Fri Feb 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.4-1
 - Update to Globus Toolkit 5.0.3