rpms/parrot/F-12 import.log, 1.2, 1.3 parrot.spec, 1.3, 1.4 sources, 1.2, 1.3

Gerd Pokorra gerd at fedoraproject.org
Fri Nov 20 12:23:10 UTC 2009


Author: gerd

Update of /cvs/pkgs/rpms/parrot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3806/F-12

Modified Files:
	import.log parrot.spec sources 
Log Message:
update to 1.8.0
add the parrot-nqp binary, with generation the according man-page



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Sep 2009 18:17:12 -0000	1.2
+++ import.log	20 Nov 2009 12:23:09 -0000	1.3
@@ -1,2 +1,3 @@
 parrot-1_5_0-2_fc11:F-12:parrot-1.5.0-2.fc11.src.rpm:1252074189
 parrot-1_6_0-1_fc11:F-12:parrot-1.6.0-1.fc11.src.rpm:1253038484
+parrot-1_8_0-1_fc11:F-12:parrot-1.8.0-1.fc11.src.rpm:1258719249


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/parrot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parrot.spec	29 Sep 2009 12:30:02 -0000	1.3
+++ parrot.spec	20 Nov 2009 12:23:10 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           parrot
-Version:        1.6.0
-Release:        2%{?dist}
-Summary:        Parrot is a virtual machine
+Version:        1.8.0
+Release:        1%{?dist}
+Summary:        a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://www.parrot.org/
@@ -113,7 +113,7 @@ chmod +x %{__perl_provides}
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
 %ifarch ppc64
-# the TGE don't build with this version with the optimize="-O2" option on ppc64
+# the PGE don't build with this version with the optimize="-O2" option on ppc64
     RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
 %endif
 
@@ -128,8 +128,7 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex \
-    --jitcapable=0     # necessary for rakudo-rpm on ix86
+    --lex=%{_bindir}/flex
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
@@ -145,22 +144,26 @@ make html
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# 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 
 #              language development 
 make install-dev DESTDIR=$RPM_BUILD_ROOT
 
-#Creating man-pages
+# Creating man-pages
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
-pod2man --section=1 --name=parrot docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot.1.gz
-pod2man --section=1 --name=parrot_debugger src/parrot_debugger.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_debugger.1.gz
-pod2man --section=1 --name=pbc_disassemble src/pbc_disassemble.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_disassemble.1.gz
-pod2man --section=1 --name=pbc_dump src/pbc_dump.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_dump.1.gz
-pod2man --section=1 --name=pbc_merge src/pbc_merge.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_merge.1.gz
-pod2man --section=1 --name=parrot_config tools/build/parrot_config_c.pl | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_config.1.gz
-pod2man --section=1 --name=pbc_to_exe tools/dev/pbc_to_exe.pir | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_to_exe.1.gz
-
-%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
-
+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}
@@ -169,6 +172,10 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/
 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
@@ -194,18 +201,17 @@ find docs/html -type f -size 0 -exec rm 
 # 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 \( -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' \
@@ -216,8 +222,8 @@ find examples -wholename 'examples/shoot
 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&' {} \;
+# Convert encoding of the files: docs/book/pct/ch04_pge.pod
+#                                docs/memory_internals.pod
 for file in docs/book/pct/ch04_pge.pod docs/memory_internals.pod; do
         %{__mv} $file timestamp
         iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
@@ -260,6 +266,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/parrot_config
 %{_bindir}/parrot_debugger
+%{_bindir}/parrot-nqp
 %{_bindir}/pbc_disassemble
 %{_bindir}/pbc_merge
 %{_bindir}/pbc_to_exe
@@ -274,6 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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,-)
@@ -284,9 +292,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-2
-- build only without the option '-O2' on ppc64
-- build without jitcapable; necessary for rakudo-rpm on ix86 at the moment
+* Fri Oct 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.8.0-1
+- new upstream version
+- add the parrot-nqp binary, with generation the according man-page
 
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl
@@ -298,8 +306,6 @@ rm -rf $RPM_BUILD_ROOT
 - include the necessary module Parrot::OpLib::core
 - change the place of header files to /usr/include/parrot/<version>
 - install the files /usr/src/parrot/*
-
-* Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
 * Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
@@ -330,9 +336,8 @@ rm -rf $RPM_BUILD_ROOT
 - 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Sep 2009 18:17:12 -0000	1.2
+++ sources	20 Nov 2009 12:23:10 -0000	1.3
@@ -1 +1 @@
-6fde2d91278a3990213c8671a0856e4a  parrot-1.6.0.tar.gz
+7a02fe0976dfca6864eba272044c0468  parrot-1.8.0.tar.gz




More information about the fedora-extras-commits mailing list