rpms/parrot/F-9 parrot-1.0.0-rpath-removal.patch, 1.2, 1.3 parrot-install_files.patch, 1.2, 1.3 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 parrot.spec, 1.2, 1.3 sources, 1.3, 1.4 parrot-1.x.0.patch, 1.1, NONE
Gerd Pokorra
gerd at fedoraproject.org
Wed Jul 22 16:03:09 UTC 2009
Author: gerd
Update of /cvs/pkgs/rpms/parrot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21467/F-9
Modified Files:
.cvsignore import.log parrot.spec sources
Added Files:
parrot-1.0.0-rpath-removal.patch parrot-install_files.patch
Removed Files:
parrot-1.x.0.patch
Log Message:
parrot-1.0.0-rpath-removal.patch:
libparrot.pm | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
Index: parrot-1.0.0-rpath-removal.patch
===================================================================
RCS file: parrot-1.0.0-rpath-removal.patch
diff -N parrot-1.0.0-rpath-removal.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ parrot-1.0.0-rpath-removal.patch 22 Jul 2009 16:03:08 -0000 1.3
@@ -0,0 +1,26 @@
+--- config/inter/libparrot.pm
++++ config/inter/libparrot.pm
+@@ -98,21 +98,13 @@
+ # Set -rpath (or equivalent) for executables to find the
+ # shared libparrot in the build directory.
+ $conf->data->set(
+- rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') )
+- ? $conf->data->get('rpath')
+- . $conf->data->get('build_dir')
+- . $conf->data->get('slash')
+- . $conf->data->get('blib_dir')
+- : ''
++ rpath_blib => ''
+ );
+
+ # Set -rpath (or equivalent) for the installed executables to find the
+ # installed shared libparrot.
+ $conf->data->set(
+- rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') )
+- ? $conf->data->get('rpath')
+- . $conf->data->get('libdir')
+- : ''
++ rpath_lib => ''
+ );
+
+ unless ( defined( $conf->data->get('libparrot_ldflags') ) ) {
parrot-install_files.patch:
install_files.pl | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
Index: parrot-install_files.patch
===================================================================
RCS file: parrot-install_files.patch
diff -N parrot-install_files.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ parrot-install_files.patch 22 Jul 2009 16:03:08 -0000 1.3
@@ -0,0 +1,28 @@
+--- tools/dev/install_files.pl 2009-03-11 00:35:20.000000000 +0100
++++ tools/dev/install_files.pl 2009-04-17 14:34:25.000000000 +0200
+@@ -217,7 +217,7 @@
+ # 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.
+- $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
++ $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
+ }
+ elsif ( /^compilers/ ) {
+ $dest =~ s/^compilers/languages/;
+@@ -292,6 +292,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 "copy $src to $dest: $!\n";
+ print "$dest\n";
+ }
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 21 Jul 2009 16:46:31 -0000 1.3
+++ .cvsignore 22 Jul 2009 16:03:08 -0000 1.4
@@ -1 +1 @@
-parrot-1.4.0.tar.gz
+parrot-1.0.0.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 21 Jul 2009 16:46:31 -0000 1.2
+++ import.log 22 Jul 2009 16:03:08 -0000 1.3
@@ -1,2 +1,3 @@
parrot-1_0_0-6_fc10:F-9:parrot-1.0.0-6.fc10.src.rpm:1241002909
parrot-1_4_0-1_fc11:F-9:parrot-1.4.0-1.fc11.src.rpm:1248194441
+parrot-1_0_0-6_fc9:F-9:parrot-1.0.0-6.fc9.src.rpm:1248278479
Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-9/parrot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parrot.spec 21 Jul 2009 16:46:32 -0000 1.2
+++ parrot.spec 22 Jul 2009 16:03:08 -0000 1.3
@@ -1,29 +1,19 @@
Name: parrot
-Version: 1.4.0
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 6%{?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/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
+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
# %{_libdir}/libparrot.so.%{version}
-#
-# see for upstream: https://trac.parrot.org/parrot/ticket/844
-# patched file: MANIFEST.generated
-# Add two perl-srcipts that are need to build Rakudo
+# 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel
@@ -35,7 +25,6 @@ BuildRequires: perl(Test::Harness)
BuildRequires: perl(Test::Simple)
BuildRequires: ctags
BuildRequires: openssl-devel
-BuildRequires: flex
%package docs
@@ -43,9 +32,6 @@ 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
@@ -53,8 +39,6 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-#--
-
%package tools
Summary: Parrot Virtual Machine development for languages
Group: Development/Libraries
@@ -67,32 +51,25 @@ 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
@@ -128,7 +105,6 @@ chmod +x %{__perl_provides}
--cxx=%{__cxx} \
--optimize="$RPM_OPT_FLAGS" \
--parrot_is_shared \
- --disable-rpath \
--lex=%{_bindir}/flex \
--yacc=%{_bindir}/yacc \
--libs='-lcurses -lm'
@@ -181,9 +157,6 @@ 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
@@ -192,8 +165,6 @@ 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' \
@@ -218,7 +189,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/draft/ch05_pge.pod docs/memory_internals.pod; do
+for file in docs/book/ch09_pct.pod docs/memory_internals.pod; do
%{__mv} $file timestamp
iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
touch -r timestamp $file
@@ -272,7 +243,6 @@ 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/*
@@ -286,9 +256,6 @@ 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
@@ -331,18 +298,30 @@ 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
@@ -358,12 +337,27 @@ 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.
@@ -383,5 +377,8 @@ 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-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 21 Jul 2009 16:46:32 -0000 1.3
+++ sources 22 Jul 2009 16:03:08 -0000 1.4
@@ -1 +1 @@
-3f66816c0f2ba18bdd2cf7bedd59f045 parrot-1.4.0.tar.gz
+649ce1fb7c0edaf89dc1cd52ff267b1a parrot-1.0.0.tar.gz
--- parrot-1.x.0.patch DELETED ---
More information about the fedora-extras-commits
mailing list