rpms/globus-gram-job-manager-scripts/F-11 globus-gram-job-manager-scripts.patch, NONE, 1.1 globus-gram-job-manager-scripts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32111/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-job-manager-scripts.patch 
	globus-gram-job-manager-scripts.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


globus-gram-job-manager-scripts.patch:
 Makefile.am                  |    4 ++--
 globus-job-manager-script.pl |   21 ++++-----------------
 globus-job-manager-service   |   31 ++++++++-----------------------
 3 files changed, 14 insertions(+), 42 deletions(-)

--- NEW FILE globus-gram-job-manager-scripts.patch ---
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-script.pl	2008-08-15 13:19:59.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-script.pl	2009-07-31 20:19:41.868499889 +0200
@@ -21,27 +21,14 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
-my $path = $ENV{GLOBUS_LOCATION} . '/lib';
+use Globus::Core::Paths;
+my $path = $Globus::Core::Paths::libdir;
 
 if($^O eq 'irix')
 {
diff -ur globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service globus_gram_job_manager_scripts-0.7/globus-job-manager-service
--- globus_gram_job_manager_scripts-0.7.orig/globus-job-manager-service	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/globus-job-manager-service	2009-07-31 20:27:38.925498454 +0200
@@ -59,29 +59,17 @@
 
 BEGIN
 {
-    use POSIX qw(getcwd);
-
-    if (! exists($ENV{GLOBUS_LOCATION}))
+    if (exists($ENV{GLOBUS_LOCATION}))
     {
-        my $p = $0;
-
-        if ($p !~ m/^\//)
-        {
-            $p = getcwd() . '/' . $p;
-        }
-
-        my @p = split(/\//, $p);
-
-        $ENV{GLOBUS_LOCATION} = join('/', @p[0..$#p-2]);
-
+	push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
     }
-    push(@INC, "$ENV{GLOBUS_LOCATION}/lib/perl");
 }
 
 use strict;
 use Getopt::Long;
 use IO::File;
 use File::Copy;
+use Globus::Core::Paths;
 
 my $servicename = 'jobmanager';
 my $method = 'fork';
@@ -90,13 +78,11 @@
 my $help = 0;
 my $gpath;
 
-my $globusdir	= $ENV{GLOBUS_LOCATION};
-my $libexecdir	= "$globusdir/libexec";
-my $sysconfdir	= "$globusdir/etc";
+my $sbindir	= "$Globus::Core::Paths::sbindir";
+my $sysconfdir	= "$Globus::Core::Paths::sysconfdir";
 my $servicesdir	= "$sysconfdir/grid-services";
-my $setupdir = "$globusdir/setup/globus";
 my $job_manager_conf = "$sysconfdir/globus-job-manager.conf";
-my $perljmdir = "$globusdir/lib/perl/Globus/GRAM/JobManager";
+my $perljmdir	= "$Globus::Core::Paths::perlmoduledir/Globus/GRAM/JobManager";
 my $servicename = '';
 my $manager_type = '';
 my $extra_config = '';
@@ -143,7 +129,6 @@
 if( $add )
 {
    &create_services_file("$servicesdir/$servicename");
-   copy("${setupdir}/${manager_type}.pm", "${perljmdir}/");
 
    if($symlink_exists && ! -r "$servicesdir/jobmanager")
    {
@@ -173,7 +158,7 @@
 	exit 4;
     }
     print $service_file "stderr_log,local_cred - ".
-                    "${libexecdir}/globus-job-manager globus-job-manager ".
+		    "${sbindir}/globus-job-manager globus-job-manager ".
 		    "-conf ${job_manager_conf} -type ${manager_type} ".
 		    "-machine-type unknown ".
 		    "-publish-jobs $extra_config\n";
@@ -198,7 +183,7 @@
 {
     my $name = $_[0];
 
-    if("${setupdir}/${name}.pm")
+    if("${perljmdir}/${name}.pm")
     {
 	return 1;
     }
diff -ur globus_gram_job_manager_scripts-0.7.orig/Makefile.am globus_gram_job_manager_scripts-0.7/Makefile.am
--- globus_gram_job_manager_scripts-0.7.orig/Makefile.am	2008-08-15 11:14:45.000000000 +0200
+++ globus_gram_job_manager_scripts-0.7/Makefile.am	2009-07-31 20:42:05.504495513 +0200
@@ -8,8 +8,8 @@
 	globus-job-manager-script.pl
 
 # Extra directories we install files into
-globusperldir=$(GLOBUS_LOCATION)/lib/perl/Globus/GRAM
-perldocdir=$(GLOBUS_LOCATION)/share/doc/perl/Globus/GRAM
+globusperldir=$(perlmoduledir)/Globus/GRAM
+perldocdir=$(docdir)/$(PACKAGE)/perl/Globus/GRAM
 
 # Where targets are installed
 globusperl_DATA = \


--- NEW FILE globus-gram-job-manager-scripts.spec ---
%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-job-manager-scripts
%global _name %(tr - _ <<< %{name})
Version:	0.7
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/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/scripts globus_gram_job_manager_scripts-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_scripts-0.7
#		tar -zcf globus_gram_job_manager_scripts-0.7.tar.gz globus_gram_job_manager_scripts-0.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6822
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common-setup >= 2
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 4
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires:	perl
%endif
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core

%package doc
Summary:	Globus Toolkit - GRAM Job ManagerScripts Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GRAM Job ManagerScripts

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Job ManagerScripts Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
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 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}

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files doc -f package-doc.filelist
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-job-manager-scripts-0_7-1_fc11:F-11:globus-gram-job-manager-scripts-0.7-1.fc11.src.rpm:1259854976


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:39:24 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:43:11 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_scripts-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-scripts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:39:24 -0000	1.1
+++ sources	3 Dec 2009 15:43:11 -0000	1.2
@@ -0,0 +1 @@
+f4cfd6a389952ea7326572eda17ef544  globus_gram_job_manager_scripts-0.7.tar.gz