rpms/parrot/F-10 parrot-1.x.0.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 parrot.spec, 1.1, 1.2 sources, 1.2, 1.3 parrot-1.0.0-rpath-removal.patch, 1.1, NONE parrot-install_files.patch, 1.1, NONE

Gerd Pokorra gerd at fedoraproject.org
Tue Jul 21 16:49:22 UTC 2009 

Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6466/F-10

Modified Files:
	.cvsignore import.log parrot.spec sources 
Added Files:
	parrot-1.x.0.patch 
Removed Files:
	parrot-1.0.0-rpath-removal.patch parrot-install_files.patch 
Log Message:


parrot-1.x.0.patch:
 MANIFEST.generated             |    3 ++-
 lib/Parrot/Install.pm          |   10 ++++++++++
 tools/dev/install_dev_files.pl |    1 -
 tools/dev/install_files.pl     |    3 +--
 4 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE parrot-1.x.0.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";
         }
--- MANIFEST.generated	2009-07-14 23:49:14.000000000 +0200
+++ MANIFEST.generated.new	2009-07-17 13:39:08.000000000 +0200
@@ -241,5 +241,6 @@
 src/pmc/sub.dump                                  [devel]src
 src/pmc/undef.dump                                [devel]src
 src/string_private_cstring.h                      []
-tools/build/dynpmc.pl                             []
+tools/build/dynoplibs.pl                          [devel]
+tools/build/dynpmc.pl                             [devel]
 vtable.dump                                       [devel]src


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 11:11:20 -0000	1.2
+++ .cvsignore	21 Jul 2009 16:48:52 -0000	1.3
@@ -1 +1 @@
-parrot-1.0.0.tar.gz
+parrot-1.4.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Apr 2009 11:11:20 -0000	1.1
+++ import.log	21 Jul 2009 16:48:52 -0000	1.2
@@ -1 +1,2 @@
 parrot-1_0_0-6_fc10:F-10:parrot-1.0.0-6.fc10.src.rpm:1241003119
+parrot-1_4_0-1_fc11:F-10:parrot-1.4.0-1.fc11.src.rpm:1248194576


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot.spec	29 Apr 2009 11:11:20 -0000	1.1
+++ parrot.spec	21 Jul 2009 16:48:52 -0000	1.2
@@ -1,19 +1,29 @@
 Name:           parrot
-Version:        1.0.0
-Release:        6%{?dist}
+Version:        1.4.0
+Release:        1%{?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
-# Without Patch0 %{_libdir}/libparrot.so would not be a symbolic link to
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.gz
+
+Patch0:         parrot-1.x.0.patch
+# see for upstream:       https://trac.parrot.org/parrot/ticket/735
+# patched files:          tools/dev/install_files.pl
+#                         tools/dev/install_dev_files.pl
+# Changes the path for header files (to have no version subdirectory)
+# It is also responsible to have no subdirectory under pkgconfig.
+#
+# see for upstream:       https://trac.parrot.org/parrot/ticket/509
+# patched file:           lib/Parrot/Install.pm
+# is to have the symlink:    libparrot.so  ->  libparrot.so.%{version}
+# Without this %{_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
-Patch1:         parrot-1.0.0-rpath-removal.patch
+#
+# see for upstream:       https://trac.parrot.org/parrot/ticket/844
+# patched file:           MANIFEST.generated
+# Add two perl-srcipts that are need to build Rakudo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
@@ -25,6 +35,7 @@ BuildRequires:  perl(Test::Harness)
 BuildRequires:  perl(Test::Simple)
 BuildRequires:  ctags
 BuildRequires:  openssl-devel
+BuildRequires:  flex
  
 
 %package docs
@@ -32,6 +43,9 @@ Summary:        Parrot Virtual Machine d
 Group:          Documentation
 Requires:       perl(strict)
 Requires:       perl(warnings)
+BuildArch:      noarch
+
+#--
 
 %package devel
 Summary:        Parrot Virtual Machine development headers and libraries
@@ -39,6 +53,8 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
+#--
+
 %package tools
 Summary:        Parrot Virtual Machine development for languages
 Group:          Development/Libraries
@@ -51,25 +67,32 @@ Provides:       perl(Parrot::Pmc2c::Meth
 Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
 Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}
 
+
 %description
 Parrot is a virtual machine designed to efficiently compile and execute
 bytecode for dynamic languages. Parrot is the target for Rakudo Perl 6,
 as well as variety of other languages.
 
+#--
+
 %description docs
 Documentation in text-, POD- and HTML-format (docs/html-subdirectory) and also
 examples about the Parrot Virtual Machine.
 
+#--
+
 %description devel
 Parrot Virtual Machine development headers and libraries.
 
+#--
+
 %description tools
 Parrot Virtual Machine development files for building languages.
 
+
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -b .rpatch
 
 %{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
     src/library.c
@@ -105,6 +128,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'
@@ -157,6 +181,9 @@ find %{RPM_PAR_LIB_DIR}tools -type f -na
 find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
     -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
     -exec chmod 755 {} \;
+# Set path to perl binary
+find %{RPM_PAR_LIB_DIR}tools/build -type f -name "dyn*.pl" \
+    -exec %{__sed} -i -e '1 s&# ex: set ro:&#!/usr/bin/perl&' {} \; 
 # This module is only needed for building and should not be installed (I think)
 # module "Parrot::OpLib::core"
 rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib
@@ -165,6 +192,8 @@ rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parro
 find docs/html -type f -size 0 -exec rm -f {} \;
 
 # Set path for installed programs in docs package
+find examples/json -type f -name "*.pir" \
+    -exec %{__sed} -i -e '1 s&#!../../parrot&#!/usr/bin/parrot&' {} \;
 find examples -type f -name "*.pl" \
     -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
 find examples -wholename 'examples/pir/befunge/t/basic.t' \
@@ -189,7 +218,7 @@ find examples -wholename 'examples/langu
 
 find examples/languages -type f -name harness \
     -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
-for file in docs/book/ch09_pct.pod docs/memory_internals.pod; do
+for file in docs/book/draft/ch05_pge.pod docs/memory_internals.pod; do
         %{__mv} $file timestamp
         iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
         touch -r timestamp $file
@@ -243,6 +272,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/*
@@ -256,6 +286,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
+- add the new disable-rpath configure option
+
 * Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
 - add a list of changes from Lubomir Rintel
 - add patch to remove rpath
@@ -298,30 +331,18 @@ rm -rf $RPM_BUILD_ROOT
 - added make html
 - make reallyinstall => make install
 
-* Tue Jan 20 2009 chromatic <chromatic at wgz.org> 0.9.0
-- updated to 0.9.0
-
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Nov 18 2008 chromatic <chromatic at parrot.org> 0.8.1
-- updated to 0.8.1
-
 * Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
 - updated to 0.8.0
 
-* Tue Sep 16 2008 pmichaud <pmichaud at pobox.com> 0.7.1
-- updated to 0.7.1
-
 * Wed Sep  3 2008 chromatic <chromatic at wgz.org> 0.7.0
 - install parrot_config (not parrot-config)
 
 * Tue Jun 17 2008 Nuno Carvalho <smash at cpan.org> 0.6.3
 - updated to 0.6.3
 
-* Tue May 20 2008 chromatic <chromatic at wgz.org>> 0.6.2
-- updated to 0.6.2
-
 * Mon Apr 28 2008 chromatic <chromatic at wgz.org> 0.6.1
 - minor fixes; tested with Fedora 7, 8, and 9-beta
 
@@ -337,27 +358,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
 - Update to 0.5.1.
 
-* Tue Nov 20 2007 chromatic <chromatic at wgz.org> 0.5.0
-- Update to 0.5.0.
-
-* Fri May 25 2007 David Fetter <david at fetter.org> 0.4.12-1
-- Update to 0.4.12.
-
-* Wed Apr 18 2007 Steven Pritchard <steve at kspei.com> 0.4.11-1
-- Update to 0.4.11.
-
-* Wed Mar 21 2007 Steven Pritchard <steve at kspei.com> 0.4.10-1
-- Update to 0.4.10.
-
 * Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
 - Update to 0.4.9.
 - BR ncurses-devel.
 - For some reason now I need to force -lm too.
 - Remove some files/directories that shouldn't be included.
 
-* Wed Jan 17 2007 Steven Pritchard <steve at kspei.com> 0.4.8-1
-- Attempt update to 0.4.8.
-
 * Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
 - Override lib_dir and make various substitutions to try to fix multilib.
 - Remove rpath use from Makefile.
@@ -377,8 +383,5 @@ rm -rf $RPM_BUILD_ROOT
 - Add -lcurses to get readline detection to work.
 - BR libicu-devel.
 
-* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-1
-- Initial packaging attempt.
-
 * Tue Mar 18 2003 Steve Fink <sfink at foxglove.localdomain> 0.0.11
 - first .spec file created


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 11:11:20 -0000	1.2
+++ sources	21 Jul 2009 16:48:52 -0000	1.3
@@ -1 +1 @@
-649ce1fb7c0edaf89dc1cd52ff267b1a  parrot-1.0.0.tar.gz
+3f66816c0f2ba18bdd2cf7bedd59f045  parrot-1.4.0.tar.gz


--- parrot-1.0.0-rpath-removal.patch DELETED ---


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

More information about the fedora-extras-commits mailing list