rpms/globus-gram-job-manager-setup-condor/F-12 globus-condor-print-config, NONE, 1.1 globus-gram-job-manager-setup-condor.patch, NONE, 1.1 globus-gram-job-manager-setup-condor.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Jul 20 11:36:49 UTC 2010

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager-setup-condor/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6990/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-condor-print-config 
	globus-gram-job-manager-setup-condor.patch 
	globus-gram-job-manager-setup-condor.spec import.log 
Log Message:
* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.4-1
- Update to Globus Toolkit 5.0.2

--- NEW FILE globus-condor-print-config ---
#!/bin/sh

UNAME_MACHINE=`(uname -m) 2> /dev/null ` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2> /dev/null ` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2> /dev/null ` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2> /dev/null ` || UNAME_VERSION=unknown

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}" in
    *:FreeBSD:6*)
        CONDOR_OS=FREEBSD6
        ;;
    *:Linux:*)
	CONDOR_OS=LINUX
	;;
    *:OSF1:*)
	CONDOR_OS=OSF1
	;;
    *:SunOS:5.[[6-9]])
	CONDOR_OS=SOLARIS`echo ${UNAME_RELEASE} | sed -e 's:5\.\(.\):2\1:'`
	;;
    *:SunOS:5.10)
        CONDOR_OS=SOLARIS5.10
        ;;
    *:HP-UX:*)
        CONDOR_OS=HPUX11
        ;;
    *:Darwin:*)
        CONDOR_OS=OSX
        ;;
    *:AIX:*)
        CONDOR_OS=AIX${UNAME_VERSION}${UNAME_RELEASE}
        ;;
    *)
        CONDOR_OS=unknown
	;;
esac

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}" in
    alpha:*:*)
	CONDOR_ARCH=ALPHA
	;;
    x86_64:*:*)
        CONDOR_ARCH=x86_64
        ;;
    i?86*:*:*)
	CONDOR_ARCH=INTEL
	;;
    sun4*:*:*)
	CONDOR_ARCH=`uname -m | sed -e 's:sun4\(.\):SUN4\1:'`
	;;
    9000/?00:*:*)
        CONDOR_ARCH=HPPA2
        ;;
    ia64:*:*)
        CONDOR_ARCH=IA64
        ;;
    "Power Macintosh":*:*)
        CONDOR_ARCH=PPC
        ;;
    *:AIX:[[23]]) 
        CONDOR_ARCH=PWR3II 
        ;; 
    *)
        CONDOR_ARCH=unknown
	;;
esac

echo "-condor-arch $CONDOR_ARCH -condor-os $CONDOR_OS"

globus-gram-job-manager-setup-condor.patch:
 condor.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE globus-gram-job-manager-setup-condor.patch ---
diff -ur globus_gram_job_manager_setup_condor-4.4.orig/condor.in globus_gram_job_manager_setup_condor-4.4/condor.in
--- globus_gram_job_manager_setup_condor-4.4.orig/condor.in	2010-06-11 22:49:41.000000000 +0200
+++ globus_gram_job_manager_setup_condor-4.4/condor.in	2010-07-17 13:37:11.932553500 +0200
@@ -59,7 +59,7 @@
     my $description = $self->{JobDescription};
     my $stdout = $description->stdout();
     my $stderr = $description->stderr();
-    my $globus_condor_conf = "$ENV{GLOBUS_LOCATION}/etc/globus-condor.conf";
+    my $globus_condor_conf = "$Globus::Core::Paths::sysconfdir/globus-condor.conf";
 
     if (! exists($self->{condor_logfile}))
     {


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

Name:		globus-gram-job-manager-setup-condor
%global _name %(tr - _ <<< %{name})
Version:	4.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Condor Job Manager Setup

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.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/gram/jobmanager/setup/condor globus_gram_job_manager_setup_condor-4.4
#		cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_setup_condor-4.4
#		tar -zcf globus_gram_job_manager_setup_condor-4.4.tar.gz globus_gram_job_manager_setup_condor-4.4
Source:		%{_name}-%{version}.tar.gz
#		Condor configuration generator script
#		The version of this script that is installed by the package
#		hardcodes the architecture at compilation time
#		This version detects the architecture at runtime, which is
#		appropriate for a noarch package
Source1:	globus-condor-print-config
#		Remove hardcoded paths:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6826
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-gram-job-manager-scripts
Requires:	globus-gass-cache-program >= 2
Requires:	globus-common-setup >= 2
Requires:	globus-gram-job-manager >= 10.59
Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-core
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package doc
Summary:	Globus Toolkit - Condor Job Manager Setup 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:
Condor Job Manager Setup

%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:
Condor Job Manager Setup 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 --enable-doxygen

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# Create perl module
mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/Globus/GRAM/JobManager
sed -e "s!'@CONDOR_SUBMIT@'!(defined(\$ENV{CONDOR_SUBMIT}) ? \$ENV{CONDOR_SUBMIT} : \"condor_submit\")!" \
    -e "s!'@CONDOR_RM@'!(defined(\$ENV{CONDOR_RM}) ? \$ENV{CONDOR_RM} : \"condor_rm\")!" \
    -e "s!'@CONDOR_CONFIG@'!(defined(\$ENV{CONDOR_CONFIG}) ? \$ENV{CONDOR_CONFIG} : \"\")!" \
  $RPM_BUILD_ROOT%{_datadir}/globus/setup/condor.in > \
  $RPM_BUILD_ROOT%{perl_vendorlib}/Globus/GRAM/JobManager/condor.pm

# Extract validation file
sed -n '/print VALIDATION_FILE <<EOF/,/^EOF$/p' \
  $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-job-manager-condor.pl \
  | sed -e '1d' -e '$d' > $RPM_BUILD_ROOT%{_datadir}/globus/condor.rvf

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# Remove some intermediate files
rm -rf $RPM_BUILD_ROOT%{_datadir}/globus/setup
sed '/globus\/setup/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_pgm.filelist

# And install this one instead
mkdir -p $RPM_BUILD_ROOT%{_datadir}/globus/setup
install %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/globus/setup

# 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_pgm.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}
%{_datadir}/globus/packages/setup/globus_gram_job_manager_service_setup/%{_name}.gpt
%{_datadir}/globus/condor.rvf
%{_datadir}/globus/setup/globus-condor-print-config
%{perl_vendorlib}/Globus
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

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

%changelog
* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.4-1
- Update to Globus Toolkit 5.0.2

* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.2-1
- Update to Globus Toolkit 5.0.0

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


--- NEW FILE import.log ---
globus-gram-job-manager-setup-condor-4_4-1_fc12:F-12:globus-gram-job-manager-setup-condor-4.4-1.fc12.src.rpm:1279625794


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-setup-condor/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	20 Jul 2010 03:21:54 -0000	1.1
+++ .cvsignore	20 Jul 2010 11:36:48 -0000	1.2
@@ -0,0 +1 @@
+globus_gram_job_manager_setup_condor-4.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-setup-condor/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Jul 2010 03:21:54 -0000	1.1
+++ sources	20 Jul 2010 11:36:49 -0000	1.2
@@ -0,0 +1 @@
+d6c6e6dd7361e44704fc7f73039c01c4  globus_gram_job_manager_setup_condor-4.4.tar.gz

