[rakudo/f14/master] update with rakudo-star sources

Mon Aug 30 06:02:32 UTC 2010

commit d7b2c758007a7c7d84f43e3440a8c34120fc99ba
Author: gerd <gp at zimt.uni-siegen.de>
Date:   Mon Aug 30 08:02:32 2010 +0200

    update with rakudo-star sources

 .gitignore  |    4 ++
 rakudo.spec |   98 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 sources     |    4 +-
 3 files changed, 87 insertions(+), 19 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5a20581..c4b08b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@ rakudo-star-2010.07.tar.gz
 rakudo.patch
 /rakudo-2010.08.1.tar.gz
 /rakudo_2010.08.patch
+rakudo-star-2010.08.tar.gz
+rakudo.desk.in.tar.gz
+rakudo-2010.08.1.tar.gz
+rakudo_2010.08.patch
diff --git a/rakudo.spec b/rakudo.spec
index 395cb94..ab007c9 100644
--- a/rakudo.spec
+++ b/rakudo.spec
@@ -7,14 +7,14 @@
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        1%{?dist}
-Summary:        A Perl compiler on Parrot
+Release:        2%{?dist}
+Summary:        A Perl compiler on Parrot, Perl6-modules, Blizkost and documentation
 License:        Artistic 2.0
 Group:          Development/Languages
 URL:            http://www.rakudo.org/
 
-Source0:        http://github.com/downloads/rakudo/rakudo/rakudo-%{year}.%{month}.1.tar.gz
-Patch0:         rakudo_2010.08.patch
+Source0:        http://github.com/downloads/rakudo/star/rakudo-star-%{year}.%{month}.tar.gz
+Source1:        rakudo.desk.in.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,51 +22,98 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 BuildRequires:  gmp-devel
-#BuildRequires:  gdbm-devel
 BuildRequires:  libicu-devel
 
 BuildRequires:  parrot >= %{parrot_version}
 BuildRequires:  parrot-devel >= %{parrot_version}
 BuildRequires:  parrot-tools >= %{parrot_version}
 
+# Needed for building blizkost
+BuildRequires:  perl(ExtUtils::Embed)
+
+# Needed for desktop-file-install usage
+BuildRequires:  desktop-file-utils
+
+
 %description
 Rakudo Perl 6, or just Rakudo, is a Perl 6 compiler for the Parrot virtual
 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.
+
 
 %prep
-%setup -q -n %{name}-%{year}.%{month}.1
-%patch0 -p0
-exit 0
+%setup -q -n %{name}-star-%{year}.%{month}
+
 
 %build
 %{__perl} Configure.pl
-%{__sed} -i -e 's&$(DESTDIR)$(DOCDIR)/rakudo&$(DESTDIR)$(DOCDIR)/rakudo-%{version}&' Makefile
-make
+%{__make}
+%{__make} blizkost
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+
+
+# Rakudo installation
+%{__sed} -i -e 's&$(DESTDIR)$(DOCDIR)/rakudo&$(DESTDIR)$(DOCDIR)/rakudo-%{version}&' rakudo/Makefile
+
+%{__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/2.7.0/languages/perl5/README
+
+
+# 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 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
+%{__rm} m_install/usr/bin/perl6
+
+# Now copy to $RPM_BUILD_ROOT
+%{__cp} -r m_install/* $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
 
 # 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
+%define DESK_TARGET ${RPM_BUILD_ROOT}%{_datadir}/applications/
+%{__mkdir} -p %{DESK_TARGET}
+# specs-URL
+%{__tar} xzf %{SOURCE1} --directory=%{DESK_TARGET} perl6_specs_link.desktop
+# UsingPerl6-PDF-document
+%{__tar} xzf %{SOURCE1} --to-stdout rakudo_guide_pdf.desk.in | %{__sed} "s|@VERSION@|%{version}|g" > %{DESK_TARGET}rakudo_guide_pdf.desktop
+
+desktop-file-install --delete-original --add-category="Documentation"  \
+    --dir=%{DESK_TARGET} %{DESK_TARGET}perl6_specs_link.desktop
+desktop-file-install --delete-original --add-category="Documentation"  \
+    --dir=%{DESK_TARGET} %{DESK_TARGET}rakudo_guide_pdf.desktop
 
 
 %check
-%{?!_without_tests: make test}
-exit 0
+%{?!_without_tests: make rakudo-test}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS LICENSE README docs/ChangeLog docs/ROADMAP
-%doc docs/S11-Modules-proposal.pod
+%doc LICENSE README docs/CREDITS docs/cheatsheet.txt docs/UsingPerl6-draft.pdf
 %{_bindir}/perl6
 %{parrot_dynext}/perl6_group.so
 %{parrot_dynext}/perl6_ops.so
@@ -74,8 +121,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
+# the other modules files are in %%{parrot_lang_perl6}/lib placed with
+# %%{parrot_lang_perl6} above
+
+# desktop files
+%{_datadir}/applications/perl6_specs_link.desktop
+%{_datadir}/applications/rakudo_guide_pdf.desktop
+
 
 %changelog
+* Sun Aug 29 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2010.08_2.7.0-2
+- desktop files added
+
 * Fri Aug 27 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2010.08_2.7.0-1
 - update to rakudo 2010.08.1 on parrot 2.7.0
 
diff --git a/sources b/sources
index b3225a4..e98ae0b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-3be6d0f4f9d8d1143b6c25768e8a7342  rakudo-star-2010.07.tar.gz
-6db4988f215bfab2fa26b2f6a736732b  rakudo.patch
+abdadbc3016498c3bd8a89b53f63ae35  rakudo-star-2010.08.tar.gz
+3f49413c8b8a9d0de40678d59d29078d  rakudo.desk.in.tar.gz
 0f6b98e728945e3af0316788e3f33d22  rakudo-2010.08.1.tar.gz
 d9743c98d4f52240b25ee59c2e0eea92  rakudo_2010.08.patch
