[globus-core] Update globus-spec-creator script Add README file
Mattias Ellert
ellert at fedoraproject.org
Fri Apr 29 21:56:52 UTC 2011
commit 6c45a78be2bed0e0cc477ad44e643fb9604077b0
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Fri Apr 29 23:56:31 2011 +0200
Update globus-spec-creator script
Add README file
GLOBUS-CCOMMONLIB | 22 ++++++++++++++++++++++
globus-core.spec | 33 ++++++++++++++++++++-------------
globus-spec-creator | 41 +++++++++++++++++++++++++++++++++--------
3 files changed, 75 insertions(+), 21 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-core.spec b/globus-core.spec
index 62688c2..eee7337 100644
--- a/globus-core.spec
+++ b/globus-core.spec
@@ -13,7 +13,7 @@
Name: globus-core
%global _name %(tr - _ <<< %{name})
Version: 5.17
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Globus Toolkit - Globus Core
Group: Development/Tools
@@ -22,13 +22,15 @@ URL: http://www.globus.org/
# Source is extracted from the globus toolkit installer:
# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.2/installers/src/gt5.0.2-all-source-installer.tar.bz2
# tar -jxf gt5.0.2-all-source-installer.tar.bz2
-# mv gt5.0.2-all-source-installer/source-trees/core/cource globus_core-5.17
+# mv gt5.0.2-all-source-installer/source-trees/core/source globus_core-5.17
# tar -zcf globus_core-5.17.tar.gz globus_core-5.17
Source: %{_name}-%{version}.tar.gz
# GPT metadata to pkg-config file converter
Source1: globus-gpt2pkg-config
# Globus RPM specfile creator script
Source2: globus-spec-creator
+# README file
+Source8: GLOBUS-CCOMMONLIB
# Make file locations configurable:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
Patch0: %{name}-conf.patch
@@ -118,7 +120,9 @@ EOF
chmod +x %{__perl_requires}
%build
+# Remove files that should be replaced during bootstrap
rm -rf autom4te.cache
+
./bootstrap
%configure --includedir='${prefix}/include/globus' \
@@ -144,24 +148,18 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
-# Add -Wl,--as-needed to the libtool script if supported
-%if %{?fedora}%{!?fedora:0} >= 2
-sed 's! -shared ! \\\${wl}--as-needed&!g' \
- -i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
-%endif
-%if %{?rhel}%{!?rhel:0} >= 4
-sed 's! -shared ! \\\${wl}--as-needed&!g' \
+# Add -Wl,--as-needed to the libtool script
+sed 's!CC -shared !CC \\\${wl}--as-needed -shared !g' \
-i $RPM_BUILD_ROOT%{_sbindir}/libtool-%{flavor}
-%endif
# Install the GPT metadata to pkg-config file converter
-install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/globus/globus-gpt2pkg-config
# Install the Globus RPM specfile creator script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
+install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/globus-spec-creator
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-pod2man %SOURCE2 > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
+pod2man %{SOURCE2} > $RPM_BUILD_ROOT%{_mandir}/man1/globus-spec-creator.1
# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -180,6 +178,10 @@ sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
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}_pgm.filelist \
$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -206,8 +208,13 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_mandir}/man1/globus-spec-creator.1*
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
%changelog
+* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.17-3
+- Update globus-spec-creator script
+- Add README file
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/globus-spec-creator b/globus-spec-creator
index 14048fd..71a5b42 100644
--- a/globus-spec-creator
+++ b/globus-spec-creator
@@ -12,7 +12,7 @@ my $setupfile;
my $release = "1";
my $directory;
my $setupdirectory;
-my $toolkitversion = "5.0.2";
+my $toolkitversion = "5.0.3";
my $email;
my $nodoc;
my $help;
@@ -70,6 +70,10 @@ my $gptdesc = $gptmeta->item(0)->getElementsByTagName("Description");
my $description = $gptdesc->item(0)->getFirstChild->getData;
$description =~ s!^\s+|\s+$!!g;
+my $gptfuncgroup = $gptmeta->item(0)->getElementsByTagName("Functional_Group");
+my $funcgroup = $gptfuncgroup->item(0)->getFirstChild->getData;
+$funcgroup =~ s!^\s+|\s+$!!g;
+
for my $srcdep ($gptmeta->item(0)
->getElementsByTagName("Source_Dependencies")) {
my $type = $srcdep->getAttributeNode("Type")->getValue;
@@ -182,7 +186,7 @@ $name =~ tr/_/-/;
my $version = $gptmajorver . '.' . $gptminorver;
my $libs = 1;
-if (!%{$srcdeps{'lib_link'}} and !%{$srcdeps{'rtl_runtime'}}) {
+if (!defined $srcdeps{'lib_link'} and !defined $srcdeps{'rtl_runtime'}) {
$libs = 0;
}
@@ -196,7 +200,8 @@ if (!$libs) {
}
else {
$docpkg = 0 if defined $nodoc;
- $progspkg = 1 if (%{$srcdeps{'pgm_link'}} or %{$srcdeps{'pgm_runtime'}});
+ $progspkg = 1 if (defined $srcdeps{'pgm_link'} or
+ defined $srcdeps{'pgm_runtime'});
}
print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
@@ -238,6 +243,20 @@ if (defined $setupfile) {
print "#\t\ttar -zcf $setupname-$setupversion.tar.gz $setupname-$setupversion\n";
print "Source1:\t%{_name}_setup-%{setupversion}.tar.gz\n";
}
+print "#\t\tREADME file\n";
+print "Source8:\t";
+print "GLOBUS-CCOMMONLIB" if ($funcgroup eq 'Common');
+print "GLOBUS-CCOMMONLIB" if ($funcgroup eq 'Core');
+print "GLOBUS-GRAM5" if ($funcgroup eq 'GRAM');
+print "GLOBUS-GRAM5" if ($funcgroup eq 'Pre-WS GRAM');
+print "GLOBUS-GRAM5" if ($funcgroup eq 'ResourceManagement');
+print "GLOBUS-GRAM5" if ($funcgroup eq 'WS GRAM');
+print "GLOBUS-GRIDFTP" if ($funcgroup eq 'FileAccess');
+print "GLOBUS-GRIDFTP" if ($funcgroup eq 'GridFTP');
+print "GLOBUS-GSIC" if ($funcgroup eq 'Security');
+print "GLOBUS-RLS" if ($funcgroup eq 'Data');
+print "GLOBUS-XIO" if ($funcgroup eq 'Communication');
+print "\n";
if ($docpkg) {
print "#\t\tThis is a workaround for the broken epstopdf script in RHEL5\n";
print "#\t\tSee: https://bugzilla.redhat.com/show_bug.cgi?id=450388\n";
@@ -337,7 +356,7 @@ else {
print "BuildRequires:\tgraphviz-gd\n";
print "%endif\n";
print "BuildRequires:\tghostscript\n";
- print "%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6\n";
+ print "%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 5\n";
print "BuildRequires:\ttex(latex)\n";
print "%else\n";
print "BuildRequires:\ttetex-latex\n";
@@ -575,10 +594,11 @@ GLOBUSPACKAGEDIR=\$RPM_BUILD_ROOT%{_datadir}/globus/packages
if (not defined $pkglibs) {
print "
-# 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
" if ($libs);
}
@@ -621,6 +641,10 @@ print"
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
";
@@ -669,6 +693,7 @@ print "
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
";
print "
@@ -732,7 +757,7 @@ The package's source directory in the toolkit installer
=item B<-toolkitversion> versionnumber
-Globus toolkit version (default: 5.0.2)
+Globus toolkit version (default: 5.0.3)
=item B<-email> emailaddress
More information about the scm-commits
mailing list