[svn:parrot] r43512 - trunk/ports/fedora
gerd at svn.parrot.org
gerd at svn.parrot.org
Wed Jan 20 12:44:13 UTC 2010
Author: gerd
Date: Wed Jan 20 12:44:10 2010
New Revision: 43512
URL: https://trac.parrot.org/parrot/changeset/43512
Log:
update the spec file and patch to the current stable release (2.0.0)
Added:
trunk/ports/fedora/parrot.patch
- copied unchanged from r43511, trunk/ports/fedora/parrot-1.x.0.patch
Deleted:
trunk/ports/fedora/parrot-1.x.0.patch
Modified:
trunk/ports/fedora/parrot.spec.fedora
Deleted: trunk/ports/fedora/parrot-1.x.0.patch
==============================================================================
--- trunk/ports/fedora/parrot-1.x.0.patch Wed Jan 20 12:44:10 2010 (r43511)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- 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";
- }
Copied: trunk/ports/fedora/parrot.patch (from r43511, trunk/ports/fedora/parrot-1.x.0.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/ports/fedora/parrot.patch Wed Jan 20 12:44:10 2010 (r43512, copy of r43511, trunk/ports/fedora/parrot-1.x.0.patch)
@@ -0,0 +1,38 @@
+--- 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";
+ }
Modified: trunk/ports/fedora/parrot.spec.fedora
==============================================================================
--- trunk/ports/fedora/parrot.spec.fedora Wed Jan 20 08:46:47 2010 (r43511)
+++ trunk/ports/fedora/parrot.spec.fedora Wed Jan 20 12:44:10 2010 (r43512)
@@ -1,18 +1,18 @@
Name: parrot
-Version: 1.4.0
-Release: 9%{?dist}
-Summary: Parrot is a virtual machine
+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/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
@@ -32,6 +32,7 @@
BuildRequires: ctags
BuildRequires: openssl-devel
BuildRequires: flex
+BuildRequires: bison
%package docs
@@ -92,8 +93,6 @@
%setup -q
%patch0 -p0
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
-
cat << \EOF > %{name}-prov
#!/bin/sh
@@ -125,11 +124,9 @@
--optimize="$RPM_OPT_FLAGS" \
--parrot_is_shared \
--disable-rpath \
- --lex=%{_bindir}/flex \
- --yacc=%{_bindir}/yacc \
- --libs='-lcurses -lm'
+ --lex=%{_bindir}/flex
-# The LDD_LIBRARY_PATH hack is needed for "miniparrot"
+# The LD_LIBRARY_PATH hack is needed for "miniparrot"
# to find his parrot-library in "blib/lib"
export LD_LIBRARY_PATH=$( pwd )/blib/lib
@@ -143,14 +140,26 @@
%install
rm -rf $RPM_BUILD_ROOT
-# This hack is needed for "miniparrot" to find his parrot-library in "blib/lib"
+# The LD_LIBRARY_PATH hack is needed for the command "pbc_to_exe parrot-nqp.pbc"
+# to find his parrot-library in "blib/lib"
export LD_LIBRARY_PATH=$( pwd )/blib/lib
-# install-dev: Same as 'install' taget but also install support for development.
+# install-dev: Same as 'install' taget but also install support for
+# language development
make install-dev DESTDIR=$RPM_BUILD_ROOT
-%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
-
+# Creating man-pages
+%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
+for var in 'parrot docs/running.pod' 'parrot_debugger src/parrot_debugger.c' \
+ 'pbc_disassemble src/pbc_disassemble.c' 'pbc_dump src/pbc_dump.c' \
+ 'pbc_merge src/pbc_merge.c' 'pbc_to_exe tools/dev/pbc_to_exe.pir' \
+ 'parrot_config tools/build/parrot_config_c.pl' \
+ 'parrot-nqp compilers/nqp/README.pod'
+do
+ MAN_NAME=`echo $var | %{__perl} -na -e 'print $F[0]'`
+ MAN_SOURCE=`echo $var | %{__perl} -na -e 'print $F[1]'`
+ pod2man --section=1 --name=$MAN_NAME $MAN_SOURCE | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/${MAN_NAME}.1.gz
+done
# Drop the docs so rpm can pick them up itself.
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
@@ -159,6 +168,10 @@
find docs examples -type d -exec chmod 755 {} \;
find docs examples -type f -exec chmod 644 {} \;
+
+%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
+
+
# Force permissions on shared versioned libs so they get stripped.
# The parrot-install-script don't set the permissions right
# With changed permissions the dependencies will be found
@@ -180,22 +193,24 @@
# 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 -name "*.pl" \
- -exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
-find examples -wholename 'examples/pir/befunge/t/basic.t' \
+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' \) \
-exec %{__sed} -i -e '1 s&#! perl&#!/usr/bin/perl&' {} \;
find examples -type f -name "*.py" \
-exec %{__sed} -i -e '1 s&#! python&#!/usr/bin/python&' {} \;
find examples -type f -name "*.rb" \
-exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;
-find examples -type f -name "*.pir" \
- -exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
-find examples/shootout -type f -name "random.pasm" \
+find examples -type f \( -name "*.pir" -o \
+ -wholename 'examples/shootout/random.pasm' \) \
-exec %{__sed} -i -e '1 s&#!./parrot&#!/usr/bin/parrot&' {} \;
find examples -wholename 'examples/languages/abc/t/01-tests.t' \
@@ -206,15 +221,6 @@
find examples -wholename 'examples/languages/abc/t/harness' \
-exec %{__perl} -pi -e 's/\r$//' {} \;
-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
- %{__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
@@ -240,6 +246,7 @@
%exclude %{_libdir}/parrot/%{version}/tools
%exclude %{_libdir}/parrot/%{version}/VERSION
%{_libdir}/libparrot.so.*
+%{_mandir}/man1/parrot.1.gz
%files docs
%defattr(-,root,root,-)
@@ -249,8 +256,8 @@
%defattr(-,root,root,-)
%{_bindir}/parrot_config
%{_bindir}/parrot_debugger
+%{_bindir}/parrot-nqp
%{_bindir}/pbc_disassemble
-%{_bindir}/pbc_info
%{_bindir}/pbc_merge
%{_bindir}/pbc_to_exe
%{_bindir}/pbc_dump
@@ -258,6 +265,13 @@
%{_libdir}/libparrot.so
%exclude %{_libdir}/libparrot.a
%{_libdir}/pkgconfig/*
+%{_mandir}/man1/parrot_config.1.gz
+%{_mandir}/man1/parrot_debugger.1.gz
+%{_mandir}/man1/pbc_disassemble.1.gz
+%{_mandir}/man1/pbc_merge.1.gz
+%{_mandir}/man1/pbc_to_exe.1.gz
+%{_mandir}/man1/pbc_dump.1.gz
+%{_mandir}/man1/parrot-nqp.1.gz
%files tools
%defattr(-,root,root,-)
@@ -268,16 +282,20 @@
%changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
-- ppc test included again
-- include the necessary module Parrot::Oplib::core
-- change the place of header files to /usr/include/parrrot/<version>
-- install the files /usr/src/parrot/*
+* 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
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
+- rebuilt with new openssl
-* Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
+* Fri Aug 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.5.0-1
+- add man pages
+
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-9
+- include the necessary module Parrot::OpLib::core
+- change the place of header files to /usr/include/parrot/<version>
+- install the files /usr/src/parrot/*
- add the new disable-rpath configure option
* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
@@ -308,16 +326,12 @@
- updated to 1.0.0
* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
-- added make installable, perl6 is still not installable
+- added make installable
- added parrot_utils to devel
-- fixed Source0 url
* Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
- updated to 0.8.2
-* Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
-- Update to 0.5.3.
-
* Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
- Update to 0.5.3.
More information about the parrot-commits
mailing list