rpms/parrot/devel parrot.patch, NONE, 1.1 parrot.spec, 1.22, 1.23 parrot-1.x.0.patch, 1.2, NONE

[Gerd Pokorra]

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13033

Modified Files:
	parrot.spec 
Added Files:
	parrot.patch 
Removed Files:
	parrot-1.x.0.patch 
Log Message:
a modified patch is needed to build on Fedora 13

parrot.patch:
 config/auto/icu.pm                |    1 +
 config/gen/makefiles/parrot_pc.in |    2 +-
 lib/Parrot/Install.pm             |   10 ++++++++++
 tools/dev/install_files.pl        |    2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE parrot.patch ---
--- tools/dev/install_files.pl	2009-07-13 10:26:40.000000000 +0200
+++ tools/dev/install_files.pl	2009-07-13 13:37:49.000000000 +0200
@@ -163,7 +163,7 @@
             # libdir as it is typically done with automake installed packages.
             # If there is a use case to make this configurable we'll add a
             # seperate --pkgconfigdir option.
-            $filehash->{DestDirs} = ['pkgconfig', $parrotdir];
+            $filehash->{DestDirs} = ['pkgconfig'];
             return($filehash);
         },
     },
--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
+++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
@@ -7,4 +7,4 @@
 Description: virtual machine to execute bytecode for interpreted languages
 Version: @VERSION@
 Libs: -L${libdir} -lparrot @icu_shared@ @libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}@versiondir@
--- lib/Parrot/Install.pm	2009-06-01 09:29:57.000000000 +0200
+++ lib/Parrot/Install.pm	2009-06-03 08:41:22.000000000 +0200
@@ -220,6 +220,16 @@
         else {
             next unless -e $src;
             next if $^O eq 'cygwin' and -e "$src.exe"; # stat works, copy not
+            if (-l $src) { 
+                # check if the system supports symbolic linking 
+                use Config; 
+                if ($Config{d_symlink} && $Config{d_readlink}) { 
+                # copy as symbolic link 
+                    symlink(readlink($src), $dest); 
+                    print "$dest\n"; 
+                    next; 
+                } 
+            } 
             copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
             print "$dest\n";
         }
--- config/auto/icu.pm	2009-12-24 20:50:20.000000000 +0100
+++ config/auto/icu.pm	2009-12-24 20:57:20.000000000 +0100
@@ -148,6 +148,7 @@
     return unless defined $icuheaders;
 
     my $icudir = dirname($icuheaders);
+    $icushared =~ s/\n$//;
     $conf->data->set(
         has_icu    => 1,
         icu_shared => $icushared,


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- parrot.spec	20 Nov 2009 09:52:08 -0000	1.22
+++ parrot.spec	15 Jan 2010 17:58:55 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           parrot
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -8,7 +8,7 @@ URL:            http://www.parrot.org/
 
 Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
 
-Patch0:         parrot-1.x.0.patch
+Patch0:         parrot.patch
 # patches file:           tools/dev/install_files.pl
 # It is responsible to have no subdirectory under pkgconfig.
 #
@@ -292,6 +292,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 15 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.8.0-2
+- a modified patch is needed to build on Fedora 13
+
 * Fri Oct 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.8.0-1
 - new upstream version
 - add the parrot-nqp binary, with generating of the man-page


--- parrot-1.x.0.patch DELETED ---