[globus-xio-gsi-driver] Add README file Add missing dependencies Clear dependency libs in .la file

Mattias Ellert ellert at fedoraproject.org
Fri Apr 29 23:39:31 UTC 2011 

commit 4e0fdbb397785eb14f3150c595601e5f0ad8f412
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 01:38:58 2011 +0200

    Add README file
    Add missing dependencies
    Clear dependency libs in .la file

 GLOBUS-XIO                          |   22 ++++++++++++++++++++++
 globus-xio-gsi-driver-deps.patch    |   23 +++++++++++++++++++++++
 globus-xio-gsi-driver-funcgrp.patch |   11 +++++++++++
 globus-xio-gsi-driver.spec          |   33 ++++++++++++++++++++++++++++-----
 4 files changed, 84 insertions(+), 5 deletions(-)
---
diff --git a/GLOBUS-XIO b/GLOBUS-XIO
new file mode 100644
index 0000000..a903269
--- /dev/null
+++ b/GLOBUS-XIO
@@ -0,0 +1,22 @@
+This package is part of the Extended IO (XIO) component
+of the Globus Toolkit. For more information visit:
+
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/
+
+Admin Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/admin/
+
+Developer's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/developer/
+
+Release Notes:
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/rn/
+
+Public Interface Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/pi/
+
+Quality Profile:
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/qp/
+
+Migrating Guide:
+http://www.globus.org/toolkit/docs/latest-stable/common/xio/mig/
diff --git a/globus-xio-gsi-driver-deps.patch b/globus-xio-gsi-driver-deps.patch
new file mode 100644
index 0000000..54f32c6
--- /dev/null
+++ b/globus-xio-gsi-driver-deps.patch
@@ -0,0 +1,23 @@
+diff -ur globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in
+--- globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in	2010-03-18 10:35:33.000000000 +0100
++++ globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in	2011-04-25 06:06:38.254014639 +0200
+@@ -24,6 +24,9 @@
+             <Dependency Name="globus_gssapi_gsi"> 
+                 <Version ><Simple_Version Major="4"/></Version>
+             </Dependency>
++            <Dependency Name="globus_common">
++                <Version ><Simple_Version Major="0"/></Version>
++            </Dependency>
+         </Source_Dependencies>
+ 
+         <Source_Dependencies Type="lib_link">
+@@ -41,6 +44,9 @@
+             <Dependency Name="globus_gssapi_gsi"> 
+                 <Version ><Simple_Version Major="4"/></Version>
+             </Dependency>
++            <Dependency Name="globus_common">
++                <Version ><Simple_Version Major="0"/></Version>
++            </Dependency>
+         </Source_Dependencies>
+ 
+         <Source_Dependencies Type="doc_runtime">
diff --git a/globus-xio-gsi-driver-funcgrp.patch b/globus-xio-gsi-driver-funcgrp.patch
new file mode 100644
index 0000000..1370b12
--- /dev/null
+++ b/globus-xio-gsi-driver-funcgrp.patch
@@ -0,0 +1,11 @@
+diff -ur globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in
+--- globus_xio_gsi_driver-0.6.orig/pkgdata/pkg_data_src.gpt.in	2010-03-18 10:35:33.000000000 +0100
++++ globus_xio_gsi_driver-0.6/pkgdata/pkg_data_src.gpt.in	2011-04-25 06:16:30.401032417 +0200
+@@ -5,6 +5,7 @@
+ 
+     <Aging_Version Major="0" Minor="6" Age="0"/>
+     <Description> Globus XIO GSI Driver</Description>
++    <Functional_Group>Communication</Functional_Group>
+     <Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP at -@DIRT_BRANCH_ID@"/>
+ 
+     <src_pkg>
diff --git a/globus-xio-gsi-driver.spec b/globus-xio-gsi-driver.spec
index 693eeab..eaef285 100644
--- a/globus-xio-gsi-driver.spec
+++ b/globus-xio-gsi-driver.spec
@@ -7,7 +7,7 @@
 Name:		globus-xio-gsi-driver
 %global _name %(tr - _ <<< %{name})
 Version:	0.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Globus XIO GSI Driver
 
 Group:		System Environment/Libraries
@@ -20,6 +20,8 @@ URL:		http://www.globus.org/
 #		cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_gsi_driver-0.6
 #		tar -zcf globus_xio_gsi_driver-0.6.tar.gz globus_xio_gsi_driver-0.6
 Source:		%{_name}-%{version}.tar.gz
+#		README file
+Source8:	GLOBUS-XIO
 #		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
@@ -32,10 +34,17 @@ Patch1:		%{name}-doxygen.patch
 #		Dereferencing of type-punned pointers:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6606
 Patch2:		%{name}-type-punned-pointer.patch
+#		Missing direct dependencies:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
+Patch3:		%{name}-deps.patch
+#		Missing functional group:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7167
+Patch4:		%{name}-funcgrp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-common
 BuildRequires:	grid-packaging-tools
+BuildRequires:	globus-common-devel%{?_isa}
 BuildRequires:	globus-gssapi-error-devel%{?_isa} >= 2
 BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
 BuildRequires:	globus-xio-devel%{?_isa}
@@ -47,7 +56,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
@@ -57,6 +66,7 @@ BuildRequires:	tetex-latex
 Summary:	Globus Toolkit - Globus XIO GSI Driver Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	globus-common-devel%{?_isa}
 Requires:	globus-gssapi-error-devel%{?_isa} >= 2
 Requires:	globus-gss-assist-devel%{?_isa} >= 3
 Requires:	globus-xio-devel%{?_isa}
@@ -102,6 +112,8 @@ Globus XIO GSI Driver Documentation Files
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # Fix changed dependency namespace
 sed -e 's/"gssapi_error"/"globus_gssapi_error"/' -i pkgdata/pkg_data_src.gpt.in
@@ -148,10 +160,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
 
-# This library is opened using lt_dlopenext, so the libtool archives
-# (.la files) can not be removed - fix the libdir...
+# This library is opened using lt_dlopenext, so the libtool archive
+# (.la file) can not be removed - fix the libdir and clear dependency_libs
 for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
-  sed "s!^libdir=.*!libdir=\'%{_libdir}\'!" -i $lib
+  sed -e "s!^libdir=.*!libdir=\'%{_libdir}\'!" \
+      -e "s!^dependency_libs=.*!dependency_libs=\'\'!" -i $lib
 done
 
 # Remove static libraries (.a files)
@@ -178,6 +191,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
@@ -198,6 +215,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,-)
@@ -208,6 +226,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-7
+- Add README file
+- Add missing dependencies
+- Clear dependency libs in .la file
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

More information about the scm-commits mailing list