rpms/globus-gass-cache-program/F-12 globus-gass-cache-program.patch, NONE, 1.1 globus-gass-cache-program.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-gass-cache-program/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27437/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache-program.patch globus-gass-cache-program.spec 
	import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.7-1
- Autogenerated


globus-gass-cache-program.patch:
 Makefile.am               |    2 +-
 globus-gass-cache         |    8 ++++++--
 globus-gass-cache-destroy |    6 +++++-
 globus-gass-cache-util.pl |    2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

--- NEW FILE globus-gass-cache-program.patch ---
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache globus_gass_cache_program-2.7/globus-gass-cache
--- globus_gass_cache_program-2.7.orig/globus-gass-cache	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache	2009-07-30 23:41:30.527708246 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
-exec $GLOBUS_SH_PERL ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
+exec ${GLOBUS_SH_PERL:-perl} ${libexecdir}/globus-gass-cache-util.pl ${1+"$@"}
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy globus_gass_cache_program-2.7/globus-gass-cache-destroy
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-destroy	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-destroy	2009-07-31 00:02:15.091708661 +0200
@@ -16,7 +16,11 @@
 # limitations under the License.
 # 
 
-. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
+if test -f ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer ; then
+. ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
+else
+. ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
+fi
 globus_source ${libexecdir}/globus-sh-tools.sh
 
 #  CVS Information:
diff -ur globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl globus_gass_cache_program-2.7/globus-gass-cache-util.pl
--- globus_gass_cache_program-2.7.orig/globus-gass-cache-util.pl	2006-01-19 06:54:36.000000000 +0100
+++ globus_gass_cache_program-2.7/globus-gass-cache-util.pl	2009-07-30 23:43:10.133707580 +0200
@@ -49,7 +49,7 @@
 END_OPTIONS
 
 my $Program = $0;
-my $ProgramC = $Globus::Core::Paths::libexecdir . '/globus-gass-cache-util';
+my $ProgramC = $Globus::Core::Paths::sbindir . '/globus-gass-cache-util';
 my $Verbose = 0;
 
 
diff -ur globus_gass_cache_program-2.7.orig/Makefile.am globus_gass_cache_program-2.7/Makefile.am
--- globus_gass_cache_program-2.7.orig/Makefile.am	2004-08-24 17:38:06.000000000 +0200
+++ globus_gass_cache_program-2.7/Makefile.am	2009-07-30 23:39:14.614709802 +0200
@@ -37,7 +37,7 @@
 	globus-gass-cache-destroy
 libexec_SCRIPTS = \
 	globus-gass-cache-util.pl
-libexec_PROGRAMS = \
+sbin_PROGRAMS = \
 	globus-gass-cache-util
 
 # _SOURCES is an automake macro which contains


--- NEW FILE globus-gass-cache-program.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache-program
%global _name %(tr - _ <<< %{name})
Version:	2.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Tools to manipulate local and remote GASS caches

Group:		Applications/Internet
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/gass/cache_program/source globus_gass_cache_program-2.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_cache_program-2.7
#		tar -zcf globus_gass_cache_program-2.7.tar.gz globus_gass_cache_program-2.7
Source:		%{_name}-%{version}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6818
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-gram-client-devel%{?_isa} >= 3
BuildRequires:	globus-gass-server-ez-devel%{?_isa} >= 2
BuildRequires:	globus-gass-copy-devel%{?_isa} >= 2
BuildRequires:	globus-gass-cache-devel%{?_isa} >= 5
BuildRequires:	globus-core%{?_isa} >= 4

%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:
Tools to manipulate local and remote GASS caches

%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 --with-flavor=%{flavor}

make %{?_smp_mflags}

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

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

# 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}/%{flavor}_pgm.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist

%clean
rm -rf $RPM_BUILD_ROOT

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

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


--- NEW FILE import.log ---
globus-gass-cache-program-2_7-1_fc11:F-12:globus-gass-cache-program-2.7-1.fc11.src.rpm:1259854519


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	27 Nov 2009 05:37:58 -0000	1.1
+++ .cvsignore	3 Dec 2009 15:35:35 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache_program-2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache-program/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	27 Nov 2009 05:37:58 -0000	1.1
+++ sources	3 Dec 2009 15:35:35 -0000	1.2
@@ -0,0 +1 @@
+97db712e000bf64c6394064db4afaf23  globus_gass_cache_program-2.7.tar.gz