rpms/parrot/devel .cvsignore, 1.17, 1.18 parrot.spec, 1.36, 1.37 sources, 1.18, 1.19 parrot.patch, 1.4, NONE

[Gerd Pokorra]

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24872

Modified Files:
	.cvsignore parrot.spec sources 
Removed Files:
	parrot.patch 
Log Message:
update to 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Jun 2010 21:46:01 -0000	1.17
+++ .cvsignore	21 Jul 2010 08:24:55 -0000	1.18
@@ -1,2 +1,2 @@
-parrot-2.5.0.tar.gz
+parrot-2.6.0.tar.gz
 parrot.desk.in.tar.gz


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- parrot.spec	18 Jun 2010 21:56:43 -0000	1.36
+++ parrot.spec	21 Jul 2010 08:24:55 -0000	1.37
@@ -1,22 +1,14 @@
 Name:           parrot
-Version:        2.5.0
-Release:        3%{?dist}
+Version:        2.6.0
+Release:        2%{?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/devel/%{version}/parrot-%{version}.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/stable/%{version}/parrot-%{version}.tar.gz
 Source1:        %{name}.desk.in.tar.gz
 
-Patch0:         parrot.patch
-#
-# 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
-# %{_libdir}/libparrot.so.%{version}  
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -50,7 +42,7 @@ BuildArch:      noarch
 Summary:        Parrot Virtual Machine development headers and libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires:       pkgconfig, vim-common
 
 #--
 
@@ -93,7 +85,6 @@ Parrot Virtual Machine development files
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 cat << \EOF > %{name}-prov
@@ -153,6 +144,14 @@ export LD_LIBRARY_PATH=$( pwd )/blib/lib
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Generate several files for syntax-highlighting and automatic indenting.
+# First they are installed in BUILD-directory with make and after that
+# they needed to be copied to the RPM_BUILD_ROOT.
+(  cd editor; 
+   make vim-install VIM_DIR=.%{_datadir}/vim/vimfiles \
+                    SKELETON=%{_datadir}/vim/vimfiles;
+   cp -r ./usr $RPM_BUILD_ROOT                                )
+
 # Creating man-pages
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
 for var in 'parrot docs/running.pod' 'parrot_debugger src/parrot_debugger.c' \
@@ -201,10 +200,10 @@ find docs/html -type f -size 0 -exec rm 
 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 -path 'examples/*/*/setup.pir' \
-    -exec %{__sed} -i -e '1 s&#! ../../../parrot&#!/usr/bin/parrot&' {} \;
+find examples -type f \( -name "*.pir" -o \
+                         -wholename 'examples/shootout/random.pasm' \)  \
+    -exec %{__sed} -i -e '1 s&#!.*\(parrot\)&#!/usr/bin/\1&' {} \;
+
 find examples -type f \( -name '*.pl' -o \
                          -wholename 'examples/pir/befunge/t/basic.t' -o  \
                          -path 'examples/languages/*/harness'               \) \
@@ -214,14 +213,8 @@ find examples -type f -name "*.py" \
 find examples -type f -name "*.rb" \
     -exec %{__sed} -i -e '1 s&#! ruby&#!/usr/bin/ruby&' {} \;
 
-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' \
     -exec %{__sed} -i -e '1 s&#!perl&#!/usr/bin/perl&' {} \;
-find examples -wholename 'examples/shootout/revcomp.pir' \
-    -exec %{__sed} -i -e '1 s&#!parrot&#!/usr/bin/parrot&' {} \;
 
 find examples -wholename 'examples/languages/abc/t/harness' \
     -exec %{__perl} -pi -e 's/\r$//' {} \;
@@ -244,7 +237,7 @@ desktop-file-install --delete-original -
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
 %{?_without_fulltest: FULL=''}
-%{?!_without_tests: make ${FULL}test}
+%{?!_without_tests: make ${FULL}test; rm -f docs/doc-prep}
 
 
 %clean
@@ -267,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files docs
 %defattr(-,root,root,-)
-%doc docs examples
+%doc docs examples LICENSE
 %{_datadir}/applications/parrot_html.desktop
 %{_datadir}/applications/parrot_pdf.desktop
 
@@ -294,6 +287,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pbc_to_exe.1.gz
 %{_mandir}/man1/pbc_dump.1.gz
 %{_mandir}/man1/parrot-nqp.1.gz
+%{_datadir}/vim/vimfiles/skeleton.pir
+%{_datadir}/vim/vimfiles/plugin/parrot.vim
+%{_datadir}/vim/vimfiles/syntax/*
+%{_datadir}/vim/vimfiles/indent/pir.vim
 
 %files tools
 %defattr(-,root,root,-)
@@ -304,6 +301,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 21 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 2.6.0-2
+- updated to 2.6.0
+- add vim files for syntax-highlighting and automatic indenting
+- so requires "vim-common" is added
+- add LICENSE file to docs-subpackage
+
 * Fri Jun 18 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 2.5.0-1
 - updated to 2.5.0
 - add the ops2c binary
@@ -361,7 +364,6 @@ rm -rf $RPM_BUILD_ROOT
 - Update to 0.5.3.
 
 * Sat Mar 10 2007 Steven Pritchard <steve at kspei.com> 0.4.9-1
-- Update to 0.4.9.
 - BuildRequires ncurses-devel.
 - For some reason now I need to force -lm too.
 - Remove some files/directories that shouldn't be included.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	18 Jun 2010 21:46:01 -0000	1.18
+++ sources	21 Jul 2010 08:24:55 -0000	1.19
@@ -1,2 +1,2 @@
-c64fe3a619afbda92e92d8df93b0d05d  parrot-2.5.0.tar.gz
+a8e0d723797dc4ff3d6551d03814204a  parrot-2.6.0.tar.gz
 63344e357df345da0e91cdeb43bc1610  parrot.desk.in.tar.gz


--- parrot.patch DELETED ---