rpms/globus-core/F-10 globus-core.spec, 1.5, 1.6 globus-spec-creator, 1.2, 1.3
Mattias Ellert
ellert at fedoraproject.org
Sat Jul 25 07:27:06 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-core/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3226
Modified Files:
globus-core.spec globus-spec-creator
Log Message:
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-6
- The globus-spec-creator script now uses isa tags and noarch doc subpackages
- Replace /usr/bin/env shebangs
Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/globus-core.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-core.spec 15 Jun 2009 15:08:42 -0000 1.5
+++ globus-core.spec 25 Jul 2009 07:27:06 -0000 1.6
@@ -13,7 +13,7 @@
Name: globus-core
%global _name %(tr - _ <<< %{name})
Version: 5.15
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Globus Toolkit - Globus Core
Group: Development/Tools
@@ -169,6 +169,9 @@ $RPM_BUILD_ROOT%{_datadir}/globus/globus
pkgdata/pkg_data_%{flavor}_dev.gpt > \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
+# Don't use /usr/bin/env
+sed 's!/usr/bin/env perl!/usr/bin/perl!' -i $RPM_BUILD_ROOT%{_sbindir}/globus-*
+
# Remove license file installed directly in the buildroot
rm -f $RPM_BUILD_ROOT/GLOBUS_LICENSE
sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
@@ -205,6 +208,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%changelog
+* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-6
+- The globus-spec-creator script now uses isa tags and noarch doc subpackages
+- Replace /usr/bin/env shebangs
+
* Tue Jun 02 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-5
- Update to official Fedora Globus packaging guidelines
- Fix build configuration for s390x and kfreebsd
Index: globus-spec-creator
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-10/globus-spec-creator,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- globus-spec-creator 15 Jun 2009 15:08:42 -0000 1.2
+++ globus-spec-creator 25 Jul 2009 07:27:06 -0000 1.3
@@ -256,7 +256,8 @@ if (!$libs) {
if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
$key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
$key =~ /^globus-xio-/) {
- print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
+ print "Requires:\t$key%{?_isa}" .
+ ($value > 0 ? " >= $value\n" : "\n");
$hasrequires = 1;
}
}
@@ -272,11 +273,11 @@ if (!$libs) {
print "BuildRequires:\tgrid-packaging-tools\n";
while (($key, $value) = each(%{$srcdeps{'compile'}})) {
if ($key eq "globus-core") {
- print "BuildRequires:\t$key" .
+ print "BuildRequires:\t$key%{?_isa}" .
($value > 0 ? " >= $value\n" : "\n");
}
else {
- print "BuildRequires:\t$key-devel" .
+ print "BuildRequires:\t$key-devel%{?_isa}" .
($value > 0 ? " >= $value\n" : "\n");
}
}
@@ -290,14 +291,15 @@ else {
if ($key eq 'globus-libtool' or $key eq 'globus-openssl' or
$key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
$key =~ /^globus-xio-/) {
- print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
+ print "Requires:\t$key%{?_isa}" .
+ ($value > 0 ? " >= $value\n" : "\n");
$hasrequires = 1;
}
}
# Need at least one Requires to own directories
print "Requires:\tglobus-common\n" unless $hasrequires;
while (($key, $value) = each(%{$srcdeps{'rtl_runtime'}})) {
- print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
+ print "Requires:\t$key%{?_isa}" . ($value > 0 ? " >= $value\n" : "\n");
}
while (($key, $value) = each(%{$setupdeps{'rtl'}})) {
print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
@@ -306,33 +308,28 @@ else {
print "BuildRequires:\tgrid-packaging-tools\n";
while (($key, $value) = each(%{$srcdeps{'compile'}})) {
if ($key eq "globus-core") {
- print "BuildRequires:\t$key" .
+ print "BuildRequires:\t$key%{?_isa}" .
($value > 0 ? " >= $value\n" : "\n");
}
else {
- print "BuildRequires:\t$key-devel" .
+ print "BuildRequires:\t$key-devel%{?_isa}" .
($value > 0 ? " >= $value\n" : "\n");
}
}
while (($key, $value) = each(%{$srcdeps{'doc_runtime'}})) {
- print "BuildRequires:\t$key" .
- ($value > 0 ? " >= $value\n" : "\n");
+ print "BuildRequires:\t$key" . ($value > 0 ? " >= $value\n" : "\n");
}
if ($docpkg) {
print "BuildRequires:\tdoxygen\n";
print "BuildRequires:\tgraphviz\n";
- print "BuildRequires:\tghostscript\n";
print "%if \"%{?rhel}\" == \"5\"\n";
- print "BuildRequires:\tgraphviz-gd\n";
+ print "BuildRequires:\tgraphviz-gd\n";
print "%endif\n";
- print "%if %{?fedora}%{!?fedora:0} >= 9\n";
- print "BuildRequires:\ttex(latex)\n";
+ print "BuildRequires:\tghostscript\n";
+ print "%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6\n";
+ print "BuildRequires:\ttex(latex)\n";
print "%else\n";
- print "%if %{?rhel}%{!?rhel:0} >= 6\n";
- print "BuildRequires:\ttex(latex)\n";
- print "%else\n";
- print "BuildRequires:\ttetex-latex\n";
- print "%endif\n";
+ print "BuildRequires:\ttetex-latex\n";
print "%endif\n";
}
if ($progspkg) {
@@ -342,13 +339,14 @@ else {
print "Group:\t\tApplications/Internet\n";
print "Provides:\t%{name}-setup = %{setupversion}\n"
if defined $setupfile;
- print "Requires:\t%{name} = %{version}-%{release}\n";
+ print "Requires:\t%{name}%{?_isa} = %{version}-%{release}\n";
while (($key, $value) = each(%{$srcdeps{'pgm_link'}})) {
# Explicit Requires for libraries should not be used according
# to the packaging guidelines. The autogenerated Requires on
# sonames make them redundant.
# Only add Requires for GPT glue packages and XIO plugins.
- print "Requires:\t$key" . ($value > 0 ? " >= $value\n" : "\n")
+ print "Requires:\t$key%{?_isa}" .
+ ($value > 0 ? " >= $value\n" : "\n")
if $key eq 'globus-libtool' or $key eq 'globus-openssl' or
$key eq 'globus-libxml2' or $key eq 'globus-xmlsec1' or
$key =~ /^globus-xio-/;
@@ -369,14 +367,14 @@ if ($develpkg) {
print "%package devel\n";
print "Summary:\tGlobus Toolkit - $description Development Files\n";
print "Group:\t\tDevelopment/Libraries\n";
- print "Requires:\t%{name} = %{version}-%{release}\n";
+ print "Requires:\t%{name}%{?_isa} = %{version}-%{release}\n";
while (($key, $value) = each(%{$srcdeps{'compile'}})) {
if ($key eq "globus-core") {
- print "Requires:\t$key" .
+ print "Requires:\t$key%{?_isa}" .
($value > 0 ? " >= $value\n" : "\n");
}
else {
- print "Requires:\t$key-devel" .
+ print "Requires:\t$key-devel%{?_isa}" .
($value > 0 ? " >= $value\n" : "\n");
}
}
@@ -387,6 +385,9 @@ if ($docpkg) {
print "%package doc\n";
print "Summary:\tGlobus Toolkit - $description Documentation Files\n";
print "Group:\t\tDocumentation\n";
+ print "%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6\n";
+ print "BuildArch:\tnoarch\n";
+ print "%endif\n";
print "Requires:\t%{name} = %{version}-%{release}\n";
}
More information about the fedora-extras-commits
mailing list