From 52eda2a6090367686e5d474fd4de7387ab9d44fe Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Mon, 6 Dec 2010 20:38:17 +0000 Subject: [PATCH] upgrading package: rakudo 2010.04 -> 2010.11 --- rakudo/rakudo.patch | 47 --------------------------------------------- rakudo/rakudo.spec | 13 ++++++------- 2 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 rakudo/rakudo.patch diff --git a/rakudo/rakudo.patch b/rakudo/rakudo.patch deleted file mode 100644 index 6059b89fac..0000000000 --- a/rakudo/rakudo.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: parrot/compilers/imcc/imcc.l ---- parrot/compilers/imcc/imcc.l.orig 2008-08-19 15:17:14 +0200 -+++ parrot/compilers/imcc/imcc.l 2008-08-19 22:08:27 +0200 -@@ -125,6 +125,7 @@ - %option reentrant - %option never-interactive - %option stack -+%option array - - LETTER [a-zA-Z_@] - DIGIT [0-9] -Index: parrot/config/auto/icu.pm ---- parrot/config/auto/icu.pm.orig 2008-08-19 15:17:25 +0200 -+++ parrot/config/auto/icu.pm 2008-08-19 22:09:59 +0200 -@@ -332,7 +332,7 @@ - $without = 1; - } - my $slash = $conf->data->get('slash'); -- $icuheaders .= "${slash}include"; -+ $icuheaders .= "${slash}include/icu"; - if (! -d $icuheaders) { - $without = 1; - } -Index: parrot/config/init/hints/freebsd.pm ---- parrot/config/init/hints/freebsd.pm.orig 2008-08-19 15:17:23 +0200 -+++ parrot/config/init/hints/freebsd.pm 2008-08-19 22:08:27 +0200 -@@ -34,7 +34,7 @@ - rpath => '-Wl,-R', - - has_dynamic_linking => 1, -- parrot_is_shared => 1, -+ parrot_is_shared => 0, - libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)', - libparrot_shared_alias => 'libparrot$(SHARE_EXT)', - libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)', -Index: parrot/config/init/hints/linux.pm ---- parrot/config/init/hints/linux.pm.orig 2008-08-19 15:17:23 +0200 -+++ parrot/config/init/hints/linux.pm 2008-08-19 22:08:27 +0200 -@@ -137,7 +137,7 @@ - rpath => '-Wl,-rpath=', - - has_dynamic_linking => 1, -- parrot_is_shared => 1, -+ parrot_is_shared => 0, - libparrot_shared => 'libparrot$(SHARE_EXT).$(SOVERSION)', - libparrot_shared_alias => 'libparrot$(SHARE_EXT)', - libparrot_soname => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)', diff --git a/rakudo/rakudo.spec b/rakudo/rakudo.spec index 2201e32908..87cea1e6cb 100644 --- a/rakudo/rakudo.spec +++ b/rakudo/rakudo.spec @@ -21,11 +21,9 @@ ## SUCH DAMAGE. ## -# FIXME: rse: package still does not link correctly - # package version -%define V_opkg 2010.04 -%define V_dist 2010.04 +%define V_opkg 2010.11 +%define V_dist 2010.11 # package information Name: rakudo @@ -38,7 +36,7 @@ Class: EVAL Group: Language License: Artistic Version: %{V_opkg} -Release: 20100423 +Release: 20101206 # list of sources Source0: http://cloud.github.com/downloads/rakudo/rakudo/rakudo-%{V_dist}.tar.gz @@ -48,8 +46,8 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, perl, bison PreReq: OpenPKG, openpkg >= 20060823 -BuildPreReq: parrot -PreReq: parrot +BuildPreReq: parrot >= 2.10.0 +PreReq: parrot >= 2.10.0 AutoReq: no AutoReqProv: no @@ -74,6 +72,7 @@ AutoReqProv: no %install %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files