OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Mar-2006 22:18:45
Branch: HEAD Handle: 2006031021184500
Modified files:
openpkg-src/parrot parrot.patch parrot.spec
Log:
upgrading package: parrot 0.4.0 -> 0.4.2
Summary:
Revision Changes Path
1.5 +40 -16 openpkg-src/parrot/parrot.patch
1.16 +5 -3 openpkg-src/parrot/parrot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/parrot/parrot.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 parrot.patch
--- openpkg-src/parrot/parrot.patch 8 Dec 2005 19:11:29 -0000 1.4
+++ openpkg-src/parrot/parrot.patch 10 Mar 2006 21:18:45 -0000 1.5
@@ -1,19 +1,7 @@
-Index: config/gen/icu.pm
---- config/gen/icu.pm.orig 2005-12-04 11:45:25 +0100
-+++ config/gen/icu.pm 2005-12-08 20:05:30 +0100
-@@ -71,7 +71,7 @@
- if (defined $icuheaders) {
- chomp $icuheaders;
- $without = 1 unless -d $icuheaders;
-- $icuheaders .= "${slash}include";
-+ $icuheaders .= "${slash}include/icu";
- $without = 1 unless -d $icuheaders;
- }
-
-Index: imcc/imcc.l
---- imcc/imcc.l.orig 2005-11-29 18:28:35 +0100
-+++ imcc/imcc.l 2005-12-08 20:05:30 +0100
-@@ -83,6 +83,7 @@
+Index: compilers/imcc/imcc.l
+--- compilers/imcc/imcc.l.orig 2006-02-22 11:37:25 +0100
++++ compilers/imcc/imcc.l 2006-03-10 21:38:17 +0100
+@@ -84,6 +84,7 @@
%option never-interactive
%option stack
@@ -21,3 +9,39 @@
LETTER [EMAIL PROTECTED]
DIGIT [0-9]
+Index: config/gen/icu.pm
+--- config/gen/icu.pm.orig 2006-02-19 12:53:24 +0100
++++ config/gen/icu.pm 2006-03-10 21:38:17 +0100
+@@ -73,7 +73,7 @@
+ if (defined $icuheaders) {
+ chomp $icuheaders;
+ $without = 1 unless -d $icuheaders;
+- $icuheaders .= "${slash}include";
++ $icuheaders .= "${slash}include/icu";
+ $without = 1 unless -d $icuheaders;
+ }
+
+Index: config/init/hints/freebsd.pm
+--- config/init/hints/freebsd.pm.orig 2006-01-15 21:52:43 +0100
++++ config/init/hints/freebsd.pm 2006-03-10 21:55:25 +0100
+@@ -33,7 +33,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: config/init/hints/linux.pm
+--- config/init/hints/linux.pm.orig 2006-02-16 23:58:49 +0100
++++ config/init/hints/linux.pm 2006-03-10 21:55:20 +0100
+@@ -62,7 +62,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)',
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/parrot/parrot.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 parrot.spec
--- openpkg-src/parrot/parrot.spec 1 Jan 2006 13:18:33 -0000 1.15
+++ openpkg-src/parrot/parrot.spec 10 Mar 2006 21:18:45 -0000 1.16
@@ -32,8 +32,8 @@
Class: EVAL
Group: Language
License: Artistic/GPL
-Version: 0.4.0
-Release: 20051208
+Version: 0.4.2
+Release: 20060310
# list of sources
Source0:
ftp://ftp.cpan.org/pub/CPAN/authors/id/L/LT/LTOETSCH/parrot-%{version}.tar.gz
@@ -90,11 +90,12 @@
# install program
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install \
- BUILDPREFIX=$RPM_BUILD_ROOT \
+ DESTDIR=$RPM_BUILD_ROOT \
PREFIX=%{l_prefix}/share/parrot \
EXEC_PREFIX=%{l_prefix}/share/parrot \
BIN_DIR=%{l_prefix}/bin \
LIB_DIR=%{l_prefix}/lib \
+ DOC_DIR=%{l_prefix}/share/parrot/doc \
INCLUDE_DIR=%{l_prefix}/include
# install headers (are not installed by default)
@@ -105,6 +106,7 @@
# strip down and adjust installation
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/parrot/blib
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/parrot/doc
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_shtool} install -c -m 644 \
blib/lib/libparrot.a $RPM_BUILD_ROOT%{l_prefix}/lib/
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]