[rakudo-star/f17] update to 2012.08 on top of NQP and parrot

Gerd Pokorra gerd at fedoraproject.org
Mon Sep 3 13:43:31 UTC 2012


commit 4c4511486351936ba0e0ed8427771714b12516f3
Author: gerd <gp at zimt.uni-siegen.de>
Date:   Mon Sep 3 15:36:17 2012 +0200

    update to 2012.08 on top of NQP and parrot

 rakudo-star.spec |   91 +++++++++++++++++++++++------------------------------
 sources          |    2 +-
 2 files changed, 41 insertions(+), 52 deletions(-)
---
diff --git a/rakudo-star.spec b/rakudo-star.spec
index 96c1146..e5a6d10 100644
--- a/rakudo-star.spec
+++ b/rakudo-star.spec
@@ -1,14 +1,15 @@
-%global year 2011
-%global month 07
-%global parrot_version 3.6.0
+%global year 2012
+%global month 08
+%global parrot_version 4.7.0
 
-%define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
-%define parrot_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
+%define PAR_LIB_DIR %{_libdir}/parrot/%{parrot_version}
+%define parrot_dynext %{PAR_LIB_DIR}/dynext
+%define parrot_lang_perl6 %{PAR_LIB_DIR}/languages/perl6
 
 Name:           rakudo-star
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        4%{?dist}.1
-Summary:        Rakudo, Perl6-modules, Blizkost and documentation
+Release:        1%{?dist}
+Summary:        Rakudo, Perl6-modules and documentation
 License:        Artistic 2.0
 Group:          Development/Languages
 URL:            http://www.rakudo.org/
@@ -29,8 +30,7 @@ BuildRequires:  parrot >= %{parrot_version}
 BuildRequires:  parrot-devel >= %{parrot_version}
 BuildRequires:  parrot-tools >= %{parrot_version}
 
-# Needed for building blizkost
-BuildRequires:  perl(ExtUtils::Embed)
+BuildRequires:  nqp >= 0.0.%{year}.%{month}
 
 # Needed for desktop-file-install usage
 BuildRequires:  desktop-file-utils
@@ -51,8 +51,6 @@ machine. Rakudo is an implementation of the Perl 6 specification that runs
 on the Parrot VM. More information about Perl 6 is available from:
 http://perl6.org
 Rakudo Star is a collection of things around Rakudo. It installs Perl 6 modules.
-Rakudo Star also includes Blizkost, which enables you to use Perl 5
-modules from Perl 6.
 The documentation includes a PDF-document that describes the using of Perl 6.
 
 
@@ -65,10 +63,9 @@ The documentation includes a PDF-document that describes the using of Perl 6.
 
 # add flags like '-g' to CFLAGS
 %{__sed} -i -e "/^CFLAGS/ s/$/ $RPM_OPT_FLAGS/" Makefile
-%{__sed} -i -e "/^CFLAGS/ s/$/ @optimize@/" rakudo/build/Makefile.in
+%{__sed} -i -e "/^CFLAGS/ s/$/ @optimize@/" rakudo/tools/build/Makefile.in
 
 %{__make}
-%{__make} blizkost
 
 
 %install
@@ -81,16 +78,21 @@ The documentation includes a PDF-document that describes the using of Perl 6.
 %{__make} rakudo-install DESTDIR=$RPM_BUILD_ROOT
 
 
-# Blizkost installation
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/bin
-%{__make} blizkost-install DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -f $RPM_BUILD_ROOT/usr/share/doc/parrot/%{parrot_version}/languages/perl5/README
-
+# Vielleicht zuerst eingenes nqp bauen
+#cd nqp-%{year}.%{month}
+#perl Configure.pl
+#make
+#cd ..
 
 # First install modules files to "m_install" subdirectory und then copy it
 # to $RPM_BUILD_ROOT, to avoid having the $RPM_BUILD_ROOT in installed files
-export PERL6LIB=$( pwd )/m_install%{parrot_lang_perl6}/lib
+export PERL6LIB=$( pwd )/m_install%{parrot_lang_perl6}/lib:$( pwd )/rakudo/lib
+
+cp -r rakudo/blib/Perl6 .
+cp rakudo/*.pbc .
+
 export LD_LIBRARY_PATH=$( pwd )/rakudo/dynext
+
 %{__mkdir} -p m_install/usr/bin
 %{__ln_s} ../../../perl6 m_install/usr/bin/perl6
 %{__make} modules-install DESTDIR=$( pwd )/m_install
@@ -104,7 +106,6 @@ export LD_LIBRARY_PATH=$( pwd )/rakudo/dynext
 
 # Force executable permission on shared objects so they get stripped
 %{__chmod} 755 $RPM_BUILD_ROOT%{parrot_dynext}/perl6*.so
-%{__chmod} 755 $RPM_BUILD_ROOT%{parrot_dynext}/blizkost_group.so
 
 
 # install desktop files
@@ -126,26 +127,33 @@ desktop-file-install --delete-original --add-category="Documentation"  \
 %{__make} rakudo-test
 
 # testing the modules
-export PERL6LIB=$( pwd )/m_install%{parrot_lang_perl6}/lib
+export PERL6LIB=$( pwd )/m_install%{parrot_lang_perl6}/lib:$( pwd )/rakudo/lib
 export LD_LIBRARY_PATH=$( pwd )/rakudo/dynext
-%{__cp} rakudo/Test.p* m_install%{parrot_lang_perl6}/lib
+#%{__cp} rakudo/Test.p* m_install%{parrot_lang_perl6}/lib
 #
-#prove -e ./perl6 -r modules/Algorithm-Viterbi/t
-# Configure.p* -> modules/mainline/lib/Test/
-#prove -e ./perl6 -r modules/perl6-File-Find/t
-#prove -e ./perl6 -r modules/form/t
+prove -e ./perl6 modules/Bailador/t
+#prove -e ./perl6 -r modules/DBIish/t
+#prove -e ./perl6 -r modules/doc/t
 prove -e ./perl6 -r modules/json/t
+prove -e ./perl6 -r modules/jsonrpc/t
+prove -e ./perl6 -r modules/Math-Model/t
+prove -e ./perl6 -r modules/Math-RungeKutta/t
+#prove -e ./perl6 -r modules/panda/t
+prove -e ./perl6 -r modules/perl6-digest-md5/t
+#prove -e ./perl6 -r modules/perl6-File-Tools/t
+#prove -e ./perl6 -r modules/perl6-http-easy/???
+#prove -e ./perl6 -r modules/perl6-http-status/t
 # this test fails with koji
 #    prove -e ./perl6 -r modules/perl6-lwp-simple/t
 prove -e ./perl6 -r modules/Perl6-MIME-Base64/t
-prove -e ./perl6 -r modules/Math-Model/t
-prove -e ./perl6 -r modules/Math-RungeKutta/t
-#prove -e ./perl6 -r modules/MiniDBI/t
+prove -e ./perl6 -r modules/perl6-Term-ANSIColor/t
 prove -e ./perl6 -r modules/svg/t
 prove -e ./perl6 -r modules/svg-plot/t
-prove -e ./perl6 -r modules/perl6-Term-ANSIColor/t
+prove -e ./perl6 -r modules/Template-Mojo/t
+prove -e ./perl6 -r modules/test-mock/t
+prove -e ./perl6 -r modules/uri/t
 prove -e ./perl6 -r modules/xml-writer/t
-#prove -e ./perl6 -r modules/yaml-pm6/t
+#prove -e ./perl6 -r modules/zavolaj/t
 }
 
 %clean
@@ -159,14 +167,10 @@ prove -e ./perl6 -r modules/xml-writer/t
 %{parrot_dynext}/perl6_group.so
 %{parrot_dynext}/perl6_ops.so
 %{parrot_lang_perl6}
+%{PAR_LIB_DIR}/languages/nqp/lib/Perl6
 %{_mandir}/man1/perl6.1.gz
 %{_mandir}/man1/rakudo.1.gz
 
-# Blizkost files
-%{_bindir}/parrot-blizkost
-%{_libdir}/parrot/%{parrot_version}/languages/perl5
-%{parrot_dynext}/blizkost_group.so
-
 # modules part
 # %%{_bindir}/ufo is moved to %%{parrot_lang_perl6}/bin/ufo
 # the other modules files are in %%{parrot_lang_perl6}/lib placed with
@@ -178,21 +182,6 @@ prove -e ./perl6 -r modules/xml-writer/t
 
 
 %changelog
-* Wed Apr 25 2012 Gerd Pokorra <gp at zimt.uni-siegen.de> - 0.0.2011.07_3.6.0-4.1
-- rebuild with new ICU library
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.2011.07_3.6.0-3.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Oct 26 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.0.2011.07_3.6.0-2.2
-- rebuild with new gmp without compat lib
-
-* Wed Oct 12 2011 Peter Schiffer <pschiffe at redhat.com> - 0.0.2011.07_3.6.0-2.1
-- rebuild with new gmp
-
-* Fri Sep 09 2011 Gerd Pokorra <gp at zimt.uni-siegen.de> - 0.0.2011.07_3.6.0-2
-- rebuild with new icu
-
 * Fri Aug 05 2011 Gerd Pokorra <gp at zimt.uni-siegen.de> - 0.0.2011.07_3.6.0-1
 - updated to 2011.07
 
diff --git a/sources b/sources
index 2f65644..d1f9b10 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-05018e1020b9a746d9942fd9141e1885  rakudo-star-2011.07.tar.gz
+1904f4a52edf9bcf0cc69e756c1981cb  rakudo-star-2012.08.tar.gz
 3f49413c8b8a9d0de40678d59d29078d  rakudo.desk.in.tar.gz


More information about the scm-commits mailing list