[grid-packaging-tools/el5: 3/3] Move flavor definitions to dev
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 5 14:40:31 UTC 2013
commit 18fb9d99994491921bf91b35ae61554b94110222
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 5 16:39:22 2013 +0200
Move flavor definitions to dev
grid-packaging-tools-flavors.patch | 114 ++++++++++++++++++++++++++++++++++++
grid-packaging-tools.spec | 9 +++-
2 files changed, 122 insertions(+), 1 deletions(-)
---
diff --git a/grid-packaging-tools-flavors.patch b/grid-packaging-tools-flavors.patch
new file mode 100644
index 0000000..7a3b6cb
--- /dev/null
+++ b/grid-packaging-tools-flavors.patch
@@ -0,0 +1,114 @@
+diff -ur gpt-3.6.3.orig/amdir/data.am gpt-3.6.3/amdir/data.am
+--- gpt-3.6.3.orig/amdir/data.am 2011-02-08 21:10:07.000000000 +0100
++++ gpt-3.6.3/amdir/data.am 2013-09-02 17:44:54.547296960 +0200
+@@ -80,6 +80,9 @@
+ *-*.pc) \
+ echo "$$p" >> "$${filelistdir}/$(GLOBUS_FLAVOR_NAME)_dev.filelist"; \
+ ;; \
++ *-flavor_*.gpt) \
++ echo "$$p" >> "$${filelistdir}/$(GLOBUS_FLAVOR_NAME)_dev.filelist"; \
++ ;; \
+ *-*.pm) \
+ echo "$$p" >> "$${filelistdir}/$(GLOBUS_FLAVOR_NAME)_rtl.filelist"; \
+ ;; \
+diff -ur gpt-3.6.3.orig/perl/GPT/FilelistFunctions.pm gpt-3.6.3/perl/GPT/FilelistFunctions.pm
+--- gpt-3.6.3.orig/perl/GPT/FilelistFunctions.pm 2012-02-13 15:49:57.000000000 +0100
++++ gpt-3.6.3/perl/GPT/FilelistFunctions.pm 2013-09-02 17:12:53.283920329 +0200
+@@ -762,9 +762,10 @@
+ $filessort->extract_libtool_libs();
+ $list = $filessort->get_list();
+ push @$result, @$list;
+-# for my $f(@$result) {
+-# print "rtl: $f\n"
+-# }
++ $filessort->reset();
++ $filessort->extract_perl_modules();
++ $list = $filessort->get_list();
++ push @$result, @$list;
+ $filessort->reset();
+ return $result;
+ }
+@@ -777,8 +778,15 @@
+ my $list = $filessort->get_list();
+ push @$result, @$list;
+ $filessort->reset();
+- $filessort->flavored_headers() if defined $mangling;
+- $filessort->noflavor_headers() if ! defined $mangling;
++ $filessort->flavored_headers();
++ $list = $filessort->get_list();
++ push @$result, @$list;
++ $filessort->reset();
++ $filessort->noflavor_headers();
++ $list = $filessort->get_list();
++ push @$result, @$list;
++ $filessort->reset();
++ $filessort->extract_flavor_defs();
+ $filessort->add_package_metadata_files('dev');
+ $list = $filessort->get_list();
+ push @$result, @$list;
+@@ -794,7 +802,7 @@
+ return [];
+ }
+
+-# Autolod methods go after =cut, and are processed by the autosplit program.
++# Autoload methods go after =cut, and are processed by the autosplit program.
+
+ 1;
+
+diff -ur gpt-3.6.3.orig/perl/GPT/Filelist.pm gpt-3.6.3/perl/GPT/Filelist.pm
+--- gpt-3.6.3.orig/perl/GPT/Filelist.pm 2011-02-08 21:10:08.000000000 +0100
++++ gpt-3.6.3/perl/GPT/Filelist.pm 2013-09-02 17:00:20.465982929 +0200
+@@ -202,6 +202,18 @@
+ $self->{'list'} = \@newlist;
+ }
+
++sub extract_flavor_defs {
++ my $self = shift;
++ my $list = $self->{'list'};
++ my @newlist;
++ for (@{$list}) {
++ if ($_->{'name'} =~ m!^flavor_! and $_->{'dir'} =~ m!flavors!) {
++ push @newlist, $_;
++ }
++ }
++ $self->{'list'} = \@newlist;
++}
++
+ sub extract_libtool_libs {
+ my $self = shift;
+ my $list = $self->{'list'};
+@@ -231,7 +243,7 @@
+ my $list = $self->{'list'};
+ my @newlist;
+ for (@{$list}) {
+- if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|test|include|lib(64)?|perl5?|setup|share/globus/packages)(?:/|$)!) {
++ if ($_->{'dir'} !~ m!(?:/|^)(?:share/doc|man|s?bin|libexec|test|include|lib(64)?|perl5?|setup|share/globus/packages|share/globus/flavors)(?:/|$)!) {
+ push @newlist, $_;
+ }
+ }
+diff -ur gpt-3.6.3.orig/perl/GPT/MyFilelists.pm gpt-3.6.3/perl/GPT/MyFilelists.pm
+--- gpt-3.6.3.orig/perl/GPT/MyFilelists.pm 2011-02-08 21:10:08.000000000 +0100
++++ gpt-3.6.3/perl/GPT/MyFilelists.pm 2013-09-02 17:18:29.186876033 +0200
+@@ -68,6 +68,12 @@
+ push @$result, @$list;
+ $me->{'filelist'}->reset();
+
++ $me->{'filelist'}->flavored_files() if defined $me->{'mangling'};
++ $me->{'filelist'}->extract_libtool_libs();
++ $list = $me->{'filelist'}->get_list();
++ push @$result, @$list;
++ $me->{'filelist'}->reset();
++
+ $me->{'filelist'}->extract_perl_modules();
+ $list = $me->{'filelist'}->get_list();
+ push @$result, @$list;
+@@ -85,8 +91,7 @@
+ push @$result, @$list;
+ $me->{'filelist'}->reset();
+
+- $me->{'filelist'}->flavored_files() if defined $me->{'mangling'};
+- $me->{'filelist'}->extract_libtool_libs();
++ $me->{'filelist'}->extract_flavor_defs();
+ $list = $me->{'filelist'}->get_list();
+ push @$result, @$list;
+ $me->{'filelist'}->reset();
diff --git a/grid-packaging-tools.spec b/grid-packaging-tools.spec
index 5942f05..d1cdb6b 100644
--- a/grid-packaging-tools.spec
+++ b/grid-packaging-tools.spec
@@ -2,7 +2,7 @@
Name: grid-packaging-tools
Version: 3.6.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Grid Packaging Tools (GPT)
Group: Development/Tools
@@ -13,6 +13,7 @@ URL: http://www.gridpackagingtools.com/
Source: http://www.globus.org/ftppub/gt5/5.2/5.2.3/packages/src/gpt-%{version}.tar.gz
Patch0: %{name}-syntax.patch
Patch1: %{name}-force.patch
+Patch2: %{name}-flavors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
BuildRequires: perl
@@ -43,6 +44,7 @@ easily converted.
%setup -q -n gpt-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
touch aclocal.m4
touch Makefile.in
@@ -73,6 +75,8 @@ sed '/^$libdir/d' -i %{buildroot}%{_sbindir}/* \
# globus-core package instead of having gpt compile it from source
rm %{buildroot}%{_datadir}/globus/gpt/globus_core-src.tar.gz
+chmod 644 %{buildroot}%{_datadir}/globus/gpt/gpt_noinstaller
+
%clean
rm -rf %{buildroot}
@@ -85,6 +89,9 @@ rm -rf %{buildroot}
%{perl_vendorlib}/Grid
%changelog
+* Mon Sep 02 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.6.3-6
+- Move flavor definitions to dev
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list