rpms/parrot/devel .cvsignore, 1.10, 1.11 import.log, 1.17, 1.18 parrot.patch, 1.1, 1.2 parrot.spec, 1.23, 1.24 sources, 1.11, 1.12

Gerd Pokorra gerd at fedoraproject.org
Wed Jan 20 12:20:50 UTC 2010


Author: gerd

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

Modified Files:
	.cvsignore import.log parrot.patch parrot.spec sources 
Log Message:
update to the current stable parrot release 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 Nov 2009 09:52:08 -0000	1.10
+++ .cvsignore	20 Jan 2010 12:20:49 -0000	1.11
@@ -1 +1 @@
-parrot-1.8.0.tar.gz
+parrot-2.0.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	20 Nov 2009 09:52:08 -0000	1.17
+++ import.log	20 Jan 2010 12:20:49 -0000	1.18
@@ -15,3 +15,4 @@ parrot-1_6_0-1_fc11:HEAD:parrot-1.6.0-1.
 parrot-1_6_0-2_fc11:HEAD:parrot-1.6.0-2.fc11.src.rpm:1253618562
 parrot-1_7_0-1_fc11:HEAD:parrot-1.7.0-1.fc11.src.rpm:1256487040
 parrot-1_8_0-1_fc11:HEAD:parrot-1.8.0-1.fc11.src.rpm:1258709848
+parrot-2_0_0-1_fc12:HEAD:parrot-2.0.0-1.fc12.src.rpm:1263989818

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

Index: parrot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot.patch	15 Jan 2010 17:58:55 -0000	1.1
+++ parrot.patch	20 Jan 2010 12:20:49 -0000	1.2
@@ -36,13 +36,3 @@
              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.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- parrot.spec	15 Jan 2010 17:58:55 -0000	1.23
+++ parrot.spec	20 Jan 2010 12:20:49 -0000	1.24
@@ -1,18 +1,18 @@
 Name:           parrot
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
 
-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
 
 Patch0:         parrot.patch
-# patches file:           tools/dev/install_files.pl
+# patched file:           tools/dev/install_files.pl
 # It is responsible to have no subdirectory under pkgconfig.
 #
-# patches file:           config/gen/makefiles/parrot_pc.in
+# patched file:           config/gen/makefiles/parrot_pc.in
 # So "pkg-config parrot --cflags" works correct
 #
 # see for upstream:       https://trac.parrot.org/parrot/ticket/509
@@ -112,10 +112,6 @@ chmod +x %{__perl_provides}
 # option.
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
-%ifarch ppc64
-# the PGE don't build with this version with the optimize="-O2" option on ppc64
-    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
-%endif
 
 %{__perl} Configure.pl \
     --prefix=%{_usr} \
@@ -197,10 +193,13 @@ find %{RPM_PAR_LIB_DIR}tools/dev -type f
 
 # Remove doc-files with zero-length
 find docs/html -type f -size 0 -exec rm -f {} \;
+find docs -wholename 'docs/doc-prep' -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 -path 'examples/*/*/setup.pir' \
+    -exec %{__sed} -i -e '1 s&#! ../../../parrot&#!/usr/bin/parrot&' {} \;
 find examples -type f \( -name '*.pl' -o \
                          -wholename 'examples/pir/befunge/t/basic.t' -o  \
                          -path 'examples/languages/*/harness'               \) \
@@ -222,15 +221,6 @@ find examples -wholename 'examples/shoot
 find examples -wholename 'examples/languages/abc/t/harness' \
     -exec %{__perl} -pi -e 's/\r$//' {} \;
 
-# Convert encoding of the files: docs/book/pct/ch04_pge.pod
-#                                docs/memory_internals.pod
-for file in docs/book/pct/ch04_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
-done
-%{__rm} -f timestamp
-
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
@@ -292,10 +282,7 @@ 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
+* Wed Jan 20 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 2.0.0-1
 - new upstream version
 - add the parrot-nqp binary, with generating of the man-page
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Nov 2009 09:52:08 -0000	1.11
+++ sources	20 Jan 2010 12:20:49 -0000	1.12
@@ -1 +1 @@
-7a02fe0976dfca6864eba272044c0468  parrot-1.8.0.tar.gz
+a28e09358a31ed93601deb8e5000a5f5  parrot-2.0.0.tar.gz



More information about the scm-commits mailing list