[globus-core/el5] Update to Globus Toolkit 5.2.5
Mattias Ellert
ellert at fedoraproject.org
Wed Nov 6 17:58:38 UTC 2013
commit 65678e8e17368f21a516e3f636feebbbe3733d1f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Nov 6 18:58:19 2013 +0100
Update to Globus Toolkit 5.2.5
- Drop patches implemented upstream
globus-core-aarch64-x32.patch | 92 ------------------
globus-core-ac.patch | 12 ---
globus-core-doc-once.patch | 50 ----------
globus-core-force.patch | 16 ---
globus-core-latex-count.patch | 12 ---
globus-core-spec-creator.patch | 209 ++++++++++++----------------------------
globus-core.spec | 26 ++---
sources | 2 +-
8 files changed, 71 insertions(+), 348 deletions(-)
---
diff --git a/globus-core-spec-creator.patch b/globus-core-spec-creator.patch
index 2ae5daf..d03be51 100644
--- a/globus-core-spec-creator.patch
+++ b/globus-core-spec-creator.patch
@@ -1,74 +1,52 @@
-diff -ur globus_core-8.9.orig/scripts/globus-spec-creator globus_core-8.9/scripts/globus-spec-creator
---- globus_core-8.9.orig/scripts/globus-spec-creator 2011-10-28 19:24:29.000000000 +0200
-+++ globus_core-8.9/scripts/globus-spec-creator 2013-07-27 07:13:38.009433632 +0200
-@@ -217,12 +217,16 @@
- defined $srcdeps{'pgm_runtime'});
- }
-
--print "%ifarch alpha ia64 ppc64 s390x sparc64 x86_64\n";
-+print "%ifarch aarch64 alpha ia64 ppc64 s390x sparc64 x86_64\n";
- print "%global flavor gcc64\n";
- print "%else\n";
+diff -ur globus_core-8.16.orig/scripts/globus-spec-creator globus_core-8.16/scripts/globus-spec-creator
+--- globus_core-8.16.orig/scripts/globus-spec-creator 2013-06-26 20:16:07.000000000 +0200
++++ globus_core-8.16/scripts/globus-spec-creator 2013-10-24 16:45:53.670489369 +0200
+@@ -223,6 +223,8 @@
print "%global flavor gcc32\n";
print "%endif\n\n";
-+if ($docpkg) {
-+ print "%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}\n\n";
-+}
++print "%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}\n\n";
+
print "Name:\t\t$name\n";
print "%global _name %(tr - _ <<< %{name})\n";
print "Version:\t$version\n";
-@@ -299,10 +303,10 @@
- unless $key eq 'trusted-ca-setup';
- }
- print "BuildRequires:\tgrid-packaging-tools >= 3.4\n";
-- print "BuildRequires:\tglobus-core%{?_isa} >= 8\n";
-+ print "BuildRequires:\tglobus-core >= 8\n";
- while (($key, $value) = each(%{$srcdeps{'compile'}})) {
- if ($key ne "globus-core") {
-- print "BuildRequires:\t$key-devel%{?_isa}" .
-+ print "BuildRequires:\t$key-devel" .
- ($value > 0 ? " >= $value\n" : "\n");
- }
- }
-@@ -329,10 +333,10 @@
- unless $key eq 'trusted-ca-setup';
- }
- print "BuildRequires:\tgrid-packaging-tools >= 3.4\n";
-- print "BuildRequires:\tglobus-core%{?_isa} >= 8\n";
-+ print "BuildRequires:\tglobus-core >= 8\n";
- while (($key, $value) = each(%{$srcdeps{'compile'}})) {
- if ($key ne "globus-core") {
-- print "BuildRequires:\t$key-devel%{?_isa}" .
-+ print "BuildRequires:\t$key-devel" .
- ($value > 0 ? " >= $value\n" : "\n");
- }
- }
-@@ -346,10 +350,19 @@
- print "BuildRequires:\tgraphviz-gd\n";
- print "%endif\n";
- print "BuildRequires:\tghostscript\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";
-+ print "%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7\n";
-+ print "BuildRequires:\ttex(fullpage.sty)\n";
-+ print "BuildRequires:\ttex(multirow.sty)\n";
-+ print "BuildRequires:\ttex(sectsty.sty)\n";
-+ print "BuildRequires:\ttex(tocloft.sty)\n";
-+ print "BuildRequires:\ttex(xtab.sty)\n";
-+ print "BuildRequires:\ttex-ec\n";
-+ print "BuildRequires:\ttex-courier\n";
-+ print "BuildRequires:\ttex-helvetic\n";
-+ print "BuildRequires:\ttex-times\n";
-+ print "BuildRequires:\ttex-symbol\n";
-+ print "BuildRequires:\ttex-rsfs\n";
- print "%endif\n";
- }
- if ($progspkg) {
-@@ -501,13 +514,13 @@
+@@ -257,11 +259,6 @@
+ 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";
+- print "Source9:\tepstopdf-2.9.5gw\n";
+-}
+ my $p = 0;
+ while ($ARGV[$p]) {
+ print "#\t\t### INSERT PATCH DESCRIPTION HERE ###:\n";
+@@ -479,22 +476,7 @@
+ }
+
+ print "
+-%if \"%{rhel}\" == \"5\"
+-mkdir bin
+-install %{SOURCE9} bin/epstopdf
+-%endif
+-" if ($docpkg);
+-
+-print "
+-%build";
+-
+-print "
+-%if \"%{rhel}\" == \"5\"
+-export PATH=\$PWD/bin:\$PATH
+-%endif
+-" if ($docpkg);
+-
+-print "
++%build
+ # Remove files that should be replaced during bootstrap
+ rm -f doxygen/Doxyfile*
+ rm -f doxygen/Makefile.am
+@@ -510,13 +492,13 @@
if ($docpkg) {
print "
%configure --disable-static --with-flavor=%{flavor} \\
@@ -84,7 +62,7 @@ diff -ur globus_core-8.9.orig/scripts/globus-spec-creator globus_core-8.9/script
";
}
-@@ -531,7 +544,7 @@
+@@ -540,7 +522,7 @@
%{_datadir}/globus/globus-bootstrap.sh
@@ -93,91 +71,35 @@ diff -ur globus_core-8.9.orig/scripts/globus-spec-creator globus_core-8.9/script
make %{?_smp_mflags}
-@@ -548,20 +561,20 @@
- " if ($docpkg);
-
- print "
--rm -rf \$RPM_BUILD_ROOT
--make install DESTDIR=\$RPM_BUILD_ROOT
-+rm -rf %{buildroot}
-+make install DESTDIR=%{buildroot}
- ";
-
- print "
- # setup package
- cd %{_name}_setup-%{setupversion}
--make install DESTDIR=\$RPM_BUILD_ROOT
-+make install DESTDIR=%{buildroot}
- cd -
-
- # Register setup
- perl -MGrid::GPT::Setup <<EOF
- my \\\$metadata = new Grid::GPT::Setup(package_name => \"%{_name}_setup\",
-- globusdir => \"\$RPM_BUILD_ROOT%{_prefix}\");
-+ globusdir => \"%{buildroot}%{_prefix}\");
- \\\$metadata->finish();
- EOF
-
-@@ -571,7 +584,7 @@
+@@ -548,15 +530,7 @@
" if defined $setupfile;
print "
--GLOBUSPACKAGEDIR=\$RPM_BUILD_ROOT%{_datadir}/globus/packages
-+GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
- ";
-
- if (not defined $pkglibs) {
-@@ -579,7 +592,7 @@
- # This library is opened using lt_dlopenext, so the libtool archive
- # (.la file) can not be removed - fix the libdir and clear dependency_libs
- # ... and move it to the main package
--for lib in `find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
-+for lib in `find %{buildroot}%{_libdir} -name 'lib*.la'` ; do
- sed -e \"s!^libdir=.*!libdir=\\'%{_libdir}\\'!\" \\
- -e \"s!^dependency_libs=.*!dependency_libs=\\'\\'!\" -i \$lib
- done
-@@ -591,7 +604,7 @@
- else {
- print "
- # Remove libtool archives (.la files)
--find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
-+find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
- sed '/lib.*\\.la\$/d' -i \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
- " if ($libs);
- }
-@@ -601,17 +614,11 @@
- grep GLOBUS_LICENSE \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \\
- >> \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
- sed /GLOBUS_LICENSE/d -i \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+-%install";
-
--# Remove unwanted documentation (needed for RHEL4)
--rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
--sed -e '/_%{_name}-%{version}_.*\\.3/d' \\
-- -i \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
- " if ($docpkg);
+-print "
+-%if \"%{rhel}\" == \"5\"
+-export PATH=\$PWD/bin:\$PATH
+-%endif
+-" if ($docpkg);
+-
+-print "
++%install
+ rm -rf %{buildroot}
+ make install DESTDIR=%{buildroot}
+ ";
+@@ -614,7 +588,7 @@
print "
# Install README file
--install -m 644 -p %{SOURCE8} \\
-- \$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+-install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
# Generate package filelists
";
-@@ -651,7 +658,7 @@
-
- print "
- %clean
--rm -rf \$RPM_BUILD_ROOT
-+rm -rf %{buildroot}
- ";
-
- print "
-@@ -662,15 +669,13 @@
-
+@@ -666,8 +640,8 @@
print "
%files -f package.filelist
--%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README
@@ -186,21 +108,10 @@ diff -ur globus_core-8.9.orig/scripts/globus-spec-creator globus_core-8.9/script
";
print "
- %files -f package-progs.filelist progs
--%defattr(-,root,root,-)
- " if ($progspkg);
-
- print "%dir %{_datadir}/globus/packages/%{_name}_setup
-@@ -679,13 +684,11 @@
-
- print "
- %files -f package-devel.filelist devel
--%defattr(-,root,root,-)
- " if ($develpkg);
+@@ -684,7 +658,7 @@
print "
%files -f package-doc.filelist doc
--%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}/html
+%dir %{_pkgdocdir}/html
" if ($docpkg);
diff --git a/globus-core.spec b/globus-core.spec
index abaf913..0e89792 100644
--- a/globus-core.spec
+++ b/globus-core.spec
@@ -14,23 +14,18 @@
Name: globus-core
%global _name %(tr - _ <<< %{name})
-Version: 8.9
-Release: 10%{?dist}
+Version: 8.16
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Core
Group: Development/Tools
License: ASL 2.0
URL: http://www.globus.org/
-Source: http://www.globus.org/ftppub/gt5/5.2/5.2.2/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt5/5.2/5.2.5/packages/src/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-CCOMMONLIB
Patch0: %{name}-spec-creator.patch
-Patch1: %{name}-aarch64-x32.patch
-Patch2: %{name}-ac.patch
-Patch3: %{name}-latex-count.patch
-Patch4: %{name}-force.patch
-Patch5: %{name}-doc-once.patch
-Patch6: %{name}-new-docdir.patch
+Patch1: %{name}-new-docdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: pkgconfig
@@ -50,16 +45,11 @@ Globus Core
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
-%patch6 -p1
+%patch1 -p1
%endif
-sed 's/5.2.0/5.2.4/' -i scripts/globus-spec-creator
+sed 's/5.2.0/5.2.5/' -i scripts/globus-spec-creator
sed 's/ -L$libdir//' -i config/accompiler.m4
# custom perl requires that removes dependency on gpt perl modules
@@ -139,6 +129,10 @@ rm -rf %{buildroot}
%doc %{_pkgdocdir}/README
%changelog
+* Wed Nov 06 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.16-1
+- Update to Globus Toolkit 5.2.5
+- Drop patches implemented upstream
+
* Mon Sep 02 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.9-10
- rebuild for patched GPT
diff --git a/sources b/sources
index 5366ce8..c1040e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43dcdd03b7e9ed618d2732fa9078a7bd globus_core-8.9.tar.gz
+19ac1a45dd73199cb0b1bfba17a61ffa globus_core-8.16.tar.gz
More information about the scm-commits
mailing list