rpms/parrot/F-12 parrot.patch, NONE, 1.1 import.log, 1.3, 1.4 parrot.spec, 1.4, 1.5 sources, 1.3, 1.4 parrot-1.x.0.patch, 1.1, NONE
Gerd Pokorra
gerd at fedoraproject.org
Sat Jan 23 21:03:05 UTC 2010
Author: gerd
Update of /cvs/pkgs/rpms/parrot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29900/F-12
Modified Files:
import.log parrot.spec sources
Added Files:
parrot.patch
Removed Files:
parrot-1.x.0.patch
Log Message:
update to new upstream version of Parrot (2.0.0)
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(-)
--- 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";
}
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 20 Nov 2009 12:23:09 -0000 1.3
+++ import.log 23 Jan 2010 21:03:05 -0000 1.4
@@ -1,3 +1,4 @@
parrot-1_5_0-2_fc11:F-12:parrot-1.5.0-2.fc11.src.rpm:1252074189
parrot-1_6_0-1_fc11:F-12:parrot-1.6.0-1.fc11.src.rpm:1253038484
parrot-1_8_0-1_fc11:F-12:parrot-1.8.0-1.fc11.src.rpm:1258719249
+parrot-2_0_0-1_fc12:F-12:parrot-2.0.0-1.fc12.src.rpm:1264280368
Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/parrot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- parrot.spec 20 Nov 2009 12:23:10 -0000 1.4
+++ parrot.spec 23 Jan 2010 21:03:05 -0000 1.5
@@ -1,18 +1,18 @@
Name: parrot
-Version: 1.8.0
+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-1.x.0.patch
-# patches file: tools/dev/install_files.pl
+Patch0: parrot.patch
+# 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,9 +282,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* 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 generation the according man-page
+- add the parrot-nqp binary, with generating of the man-page
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
- rebuilt with new openssl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 20 Nov 2009 12:23:10 -0000 1.3
+++ sources 23 Jan 2010 21:03:05 -0000 1.4
@@ -1 +1 @@
-7a02fe0976dfca6864eba272044c0468 parrot-1.8.0.tar.gz
+a28e09358a31ed93601deb8e5000a5f5 parrot-2.0.0.tar.gz
--- parrot-1.x.0.patch DELETED ---
More information about the scm-commits
mailing list