rpms/parrot/devel parrot-inst_files.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 parrot.spec, 1.3, 1.4 sources, 1.4, 1.5 parrot-install_files.patch, 1.1, NONE

[Gerd Pokorra]

Author: gerd

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

Modified Files:
	.cvsignore import.log parrot.spec sources 
Added Files:
	parrot-inst_files.patch 
Removed Files:
	parrot-install_files.patch 
Log Message:


parrot-inst_files.patch:

--- NEW FILE parrot-inst_files.patch ---
--- tools/dev/install_files.pl	2009-06-01 09:29:54.000000000 +0200
+++ tools/dev/install_files.pl	2009-06-02 16:12:00.000000000 +0200
@@ -133,7 +133,6 @@
         transform => sub {
             my($filehash) = @_;
             $filehash->{Dest} =~ s/^include//;
-            $filehash->{DestDirs} = [$parrotdir];
             return($filehash);
         },
     },
@@ -157,7 +156,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);
         },
     },
--- tools/dev/install_dev_files.pl	2009-06-01 09:29:54.000000000 +0200
+++ tools/dev/install_dev_files.pl	2009-06-02 16:19:07.000000000 +0200
@@ -124,7 +124,6 @@
             my($filehash) = @_;
             $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
             $filehash->{Dest} =~ s/^include//;
-            $filehash->{DestDirs} = [$parrotdir];
             return($filehash);
         },
     },
--- 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/gen/config_pm/config_pir.in	2009-06-03 14:04:53.000000000 +0200
+++ config/gen/config_pm/config_pir.in	2009-06-05 12:19:12.000000000 +0200
@@ -49,7 +49,7 @@
     $S0 = concat prefix, "/runtime"
     $I0 = stat $S0, .STAT_EXISTS
     if $I0 goto L1
-    conf_file = prefix . "/lib at versiondir@/include/config.fpmc"
+    conf_file = "@libdir@@versiondir@/include/config.fpmc"
     goto L2
   L1:
     conf_file = prefix . "/runtime/parrot/include/config.fpmc"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 May 2009 15:09:02 -0000	1.4
+++ .cvsignore	6 Jul 2009 11:57:06 -0000	1.5
@@ -1 +1 @@
-parrot-1.2.0.tar.gz
+parrot-1.3.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 May 2009 15:09:02 -0000	1.3
+++ import.log	6 Jul 2009 11:57:06 -0000	1.4
@@ -1,3 +1,4 @@
 parrot-1_0_0-6_fc10:HEAD:parrot-1.0.0-6.fc10.src.rpm:1240991349
 parrot-1_1_0-1_38922svn_fc10:HEAD:parrot-1.1.0-1.38922svn.fc10.src.rpm:1242718694
 parrot-1_2_0-1_fc11:HEAD:parrot-1.2.0-1.fc11.src.rpm:1243357683
+parrot-1_3_0-1_39897svn_fc10:HEAD:parrot-1.3.0-1.39897svn.fc10.src.rpm:1246881189


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parrot.spec	26 May 2009 15:09:02 -0000	1.3
+++ parrot.spec	6 Jul 2009 11:57:06 -0000	1.4
@@ -1,18 +1,19 @@
 Name:           parrot
-Version:        1.2.0
-Release:        1%{?dist}
+Version:        1.3.0
+Release:        1.39897svn%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
+#Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
 # Without Patch0 %{_libdir}/libparrot.so would not be a symbolic link to
 # %{_libdir}/libparrot.so.%{version}  
 # Symlink:  libparrot.so ->  libparrot.so.%{version}
 # See for upstream: https://trac.parrot.org/parrot/ticket/509
 # Extended for the package to have no subdirectory under pkgconfig
-Patch0:         parrot-install_files.patch
+Patch0:         parrot-inst_files.patch
 #Patch1:         parrot-1.0.0-rpath-removal.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -119,6 +120,7 @@ chmod +x %{__perl_provides}
     --cxx=%{__cxx} \
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
+    --disable-rpath \
     --lex=%{_bindir}/flex \
     --yacc=%{_bindir}/yacc \
     --libs='-lcurses -lm'
@@ -257,6 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
 %{_includedir}/parrot
+%{_includedir}/pmc
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 May 2009 15:09:02 -0000	1.4
+++ sources	6 Jul 2009 11:57:06 -0000	1.5
@@ -1 +1 @@
-35b463700b3d2ec1f4dfcdbdf4cfbb5f  parrot-1.2.0.tar.gz
+803cfbd69a0260e93b894c7036e64d94  parrot-1.3.0.tar.gz


--- parrot-install_files.patch DELETED ---