[globus-gram-job-manager-scripts/el4: 3/3] Post-release update from upstream

Sun Jan 8 01:22:15 UTC 2012

commit 4e6636f18399924f1972955faaafd9f901c5f00b
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Jan 8 01:11:49 2012 +0100

    Post-release update from upstream

 .gitignore                                      |    2 +-
 GLOBUS-GRAM5                                    |    6 +
 globus-gram-job-manager-scripts-undefined.patch |   21 ---
 globus-gram-job-manager-scripts.patch           |  149 -----------------------
 globus-gram-job-manager-scripts.spec            |   65 +++++------
 sources                                         |    2 +-
 6 files changed, 36 insertions(+), 209 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b4a2d72..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/globus_gram_job_manager_scripts-2.12.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-GRAM5 b/GLOBUS-GRAM5
index 44a32f6..e6e44fe 100644
--- a/GLOBUS-GRAM5
+++ b/GLOBUS-GRAM5
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/
 Admin Guide:
 http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/admin/
 
+User's Guide
+http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/user/
+
 Developer's Guide:
 http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/developer/
 
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/qp/
 
 Migrating Guide:
 http://www.globus.org/toolkit/docs/latest-stable/execution/gram5/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-gram-job-manager-scripts.spec b/globus-gram-job-manager-scripts.spec
index e37342f..095bc39 100644
--- a/globus-gram-job-manager-scripts.spec
+++ b/globus-gram-job-manager-scripts.spec
@@ -2,35 +2,23 @@
 
 Name:		globus-gram-job-manager-scripts
 %global _name %(tr - _ <<< %{name})
-Version:	2.12
-Release:	3%{?dist}
+Version:	4.2
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GRAM Job ManagerScripts
 
 Group:		Applications/Internet
 BuildArch:	noarch
 License:	ASL 2.0
 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.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.4-all-source-installer.tar.bz2
-#		mv gt5.0.4-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-2.11
-#		cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-2.11
-#		tar -zcf globus_gram_job_manager_scripts-2.11.tar.gz globus_gram_job_manager_scripts-2.11
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/updates/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRAM5
-#		Fixes for FHS installation:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
-Patch0:		%{name}.patch
-#		Undefined makefile variable:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6855
-Patch1:		%{name}-undefined.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-common-setup >= 2
+Requires:	globus-common-progs >= 14
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-core
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core >= 8
 
 %package doc
 Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
@@ -57,8 +45,6 @@ GRAM Job ManagerScripts Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -68,9 +54,12 @@ rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-%configure --without-flavor
+%configure --disable-static --without-flavor \
+	   --with-docdir=%{_docdir}/%{name}-%{version}
 
 make %{?_smp_mflags}
 
@@ -80,30 +69,27 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
 
-# Don't use /usr/bin/env
-sed 's!/usr/bin/env perl!/usr/bin/perl!' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/globus-job-manager-*
+# Move license file to main package
+grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  >> $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist
+sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Move documentation to default RPM location
-mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-sed s!doc/%{_name}!doc/%{name}-%{version}! \
-  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+# Move client man pages to progs package 
+grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  >> $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist
+sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Install README file
 install -m 644 -p %{SOURCE8} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
 
 # Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist \
+    $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
     $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
-  | sed s!^!%{_prefix}! > package.filelist
+  | sed -e 's!/man/.*!&*!' -e s!^!%{_prefix}! > package.filelist
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
-  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist
+  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,7 +100,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_vendorlib}/Globus
 %dir %{perl_vendorlib}/Globus/GRAM
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
 
 %files doc -f package-doc.filelist
@@ -124,6 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM
 
 %changelog
+* Sat Dec 17 2011 Mattias Ellert <mattias.ellert at fyssst.uu.se> - 4.2-1
+- Post-release update from upstream
+
+* Thu Dec 15 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-1
+- Update to Globus Toolkit 5.2.0
+
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.12-3
 - Perl mass rebuild
 
diff --git a/sources b/sources
index 9978d5e..f766a68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ec508958793abd57962cf1792cdc462  globus_gram_job_manager_scripts-2.12.tar.gz
+c2c922a31754e5207b0ee8da2ab1d5a7  globus_gram_job_manager_scripts-4.2.tar.gz
