rpms/globus-gram-protocol/EL-5 globus-gram-protocol.patch, NONE, 1.1 globus-gram-protocol.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-protocol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21380/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-protocol.patch globus-gram-protocol.spec 
	import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


globus-gram-protocol.patch:
 pkgdata/MyFilelists.pm |   16 +++++++++++++---
 scripts/Makefile.am    |    8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE globus-gram-protocol.patch ---
diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-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
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \


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

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version:	7.4
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Protocol Library

Group:		System Environment/Libraries
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/protocol/source globus_gram_protocol-7.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-7.4
#		tar -zcf globus_gram_protocol-7.4.tar.gz globus_gram_protocol-7.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
%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-common-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
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 devel
Summary:	Globus Toolkit - GRAM Protocol Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Protocol Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Protocol Library

%description devel
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}-devel package contains:
GRAM Protocol Library Development Files

%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 Protocol Library Documentation Files

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

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# 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

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

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

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# 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

# 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

# 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}_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%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 -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

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

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-protocol-7_4-1_fc11:EL-5:globus-gram-protocol-7.4-1.fc11.src.rpm:1255243917


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:26 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:52:30 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_protocol-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:27 -0000	1.1
+++ sources	11 Oct 2009 06:52:31 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+767e7f215133097390b08dce49997fea  globus_gram_protocol-7.4.tar.gz