rpms/parrot/devel .cvsignore, 1.13, 1.14 parrot.patch, 1.3, 1.4 parrot.spec, 1.30, 1.31 sources, 1.14, 1.15

[Gerd Pokorra]

Author: gerd

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

Modified Files:
	.cvsignore parrot.patch parrot.spec sources 
Log Message:
Update to Parrot 2.3.0 with some changes in the spec-files and adding of desktop files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Mar 2010 11:53:51 -0000	1.13
+++ .cvsignore	21 Apr 2010 10:24:38 -0000	1.14
@@ -1 +1,2 @@
-parrot-2.2.0.tar.gz
+parrot-2.3.0.tar.gz
+parrot.desk.in.tar.gz

parrot.patch:
 Install.pm |   10 ++++++++++
 1 file changed, 10 insertions(+)

Index: parrot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parrot.patch	16 Mar 2010 11:53:51 -0000	1.3
+++ parrot.patch	21 Apr 2010 10:24:38 -0000	1.4
@@ -1,14 +1,3 @@
---- 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);
-         },
-     },
 --- 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 @@


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- parrot.spec	2 Apr 2010 12:55:14 -0000	1.30
+++ parrot.spec	21 Apr 2010 10:24:38 -0000	1.31
@@ -1,16 +1,15 @@
 Name:           parrot
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.3.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/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
-# patched file:           tools/dev/install_files.pl
-# It is responsible to have no subdirectory under pkgconfig.
 #
 # see for upstream:       https://trac.parrot.org/parrot/ticket/509
 # patched file:           lib/Parrot/Install.pm
@@ -30,6 +29,10 @@ BuildRequires:  ctags
 BuildRequires:  openssl-devel
 BuildRequires:  flex
 BuildRequires:  bison
+# Needed to generate the Parrot PDF book
+BuildRequires:  perl(Pod::PseudoPod::LaTeX), texlive-latex
+# Needed to desktop-file-install usage
+BuildRequires:  desktop-file-utils
  
 
 %package docs
@@ -37,6 +40,8 @@ Summary:        Parrot Virtual Machine d
 Group:          Documentation
 Requires:       perl(strict)
 Requires:       perl(warnings)
+# Provides the executable in the desktop file (xdg-open)
+Requires:       xdg-utils
 BuildArch:      noarch
 
 #--
@@ -126,6 +131,7 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
+    --pkgconfigdir=pkgconfig \
     --lex=%{_bindir}/flex
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
@@ -134,9 +140,7 @@ export LD_LIBRARY_PATH=$( pwd )/blib/lib
 
 # pbc_to_exe would not build if %{_smp_mflags} would used
 make
-make parrot_utils
-make installable
-make html
+make html pdf
 
 
 %install
@@ -221,6 +225,18 @@ find examples -wholename 'examples/shoot
 find examples -wholename 'examples/languages/abc/t/harness' \
     -exec %{__perl} -pi -e 's/\r$//' {} \;
 
+#install desktop file
+%{__mkdir} ${RPM_BUILD_ROOT}%{_datadir}/applications/
+%{__tar} xzf %{SOURCE1} parrot_html.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_docdir}/%{name}-docs-%{version}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_html.desktop
+%{__tar} xzf %{SOURCE1} parrot_pdf.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_docdir}/%{name}-docs-%{version}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_pdf.desktop
+
+desktop-file-install --delete-original --add-category="Documentation"  \
+    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications                    \
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_html.desktop
+desktop-file-install --delete-original --add-category="Documentation"  \
+    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications                    \
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_pdf.desktop
+
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
@@ -251,6 +267,8 @@ rm -rf $RPM_BUILD_ROOT
 %files docs
 %defattr(-,root,root,-)
 %doc docs examples
+%{_datadir}/applications/parrot_html.desktop
+%{_datadir}/applications/parrot_pdf.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -262,6 +280,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pbc_merge
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
+%{_bindir}/tapir
 %{_includedir}/parrot
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
@@ -283,11 +302,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Apr 02 2010 Caolán McNamara <caolanm at redhat.com> 2.2.0-2
-- rebuild for icu 4.4
+* Tue Apr 20 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 2.3.0-1
+- updated to 2.3.0
+- add desktop files to access the documentation for reading
+- add the tapir binary
 
 * Tue Mar 16 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 2.2.0-1
-- updated to 2.2.0
 - add the parrot_nci_thunk_gen binary
 
 * Wed Jan 20 2010 Gerd Pokorra <gp at zimt.uni-siegen.de> 2.0.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Mar 2010 11:53:51 -0000	1.14
+++ sources	21 Apr 2010 10:24:39 -0000	1.15
@@ -1 +1,2 @@
-f1ecfe948a6f096bb880c54e9f920b28  parrot-2.2.0.tar.gz
+3208c996b95e970ccf4fa6d70bda588e  parrot-2.3.0.tar.gz
+63344e357df345da0e91cdeb43bc1610  parrot.desk.in.tar.gz