[globus-xio-popen-driver] Add README file Clear dependency libs in .la file
Mattias Ellert
ellert at fedoraproject.org
Fri Apr 29 22:26:49 UTC 2011
commit e073ca6136c84ae98320a2110e6f04854f42a33a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Apr 30 00:25:51 2011 +0200
Add README file
Clear dependency libs in .la file
GLOBUS-XIO | 22 ++++++++++++++++++++++
globus-xio-popen-driver-funcgrp.patch | 11 +++++++++++
globus-xio-popen-driver.spec | 24 ++++++++++++++++++++----
3 files changed, 53 insertions(+), 4 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-popen-driver-funcgrp.patch b/globus-xio-popen-driver-funcgrp.patch
new file mode 100644
index 0000000..908e30e
--- /dev/null
+++ b/globus-xio-popen-driver-funcgrp.patch
@@ -0,0 +1,11 @@
+diff -ur globus_xio_popen_driver-0.9.orig/pkgdata/pkg_data_src.gpt.in globus_xio_popen_driver-0.9/pkgdata/pkg_data_src.gpt.in
+--- globus_xio_popen_driver-0.9.orig/pkgdata/pkg_data_src.gpt.in 2010-03-24 05:50:35.000000000 +0100
++++ globus_xio_popen_driver-0.9/pkgdata/pkg_data_src.gpt.in 2011-04-25 06:45:06.544874607 +0200
+@@ -5,6 +5,7 @@
+
+ <Aging_Version Major="0" Minor="9" Age="0"/>
+ <Description> Globus XIO Pipe Open 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-popen-driver.spec b/globus-xio-popen-driver.spec
index d5ea9a6..82a08de 100644
--- a/globus-xio-popen-driver.spec
+++ b/globus-xio-popen-driver.spec
@@ -7,7 +7,7 @@
Name: globus-xio-popen-driver
%global _name %(tr - _ <<< %{name})
Version: 0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Globus Toolkit - Globus XIO Pipe Open Driver
Group: System Environment/Libraries
@@ -20,12 +20,17 @@ URL: http://www.globus.org/
# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_xio_popen_driver-0.9
# tar -zcf globus_xio_popen_driver-0.9.tar.gz globus_xio_popen_driver-0.9
Source: %{_name}-%{version}.tar.gz
+# README file
+Source8: GLOBUS-XIO
# Wrong dependency information:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6588
Patch0: %{name}-wrong-dep.patch
# Fixes for mingw compilation:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
Patch1: %{name}-mingw.patch
+# Missing Functional Group:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7167
+Patch2: %{name}-funcgrp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common
@@ -61,6 +66,7 @@ Globus XIO Pipe Open Driver Development Files
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -91,10 +97,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)
@@ -110,6 +117,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 +139,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.9-3
+- Add README file
+- Clear dependency libs in .la file
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list