[parrot] update to 5.5.0; patch perldoc.pm

Fri Oct 4 14:30:25 UTC 2013

commit 878bb6fe419b19b32fc8b334e6b6bac3e7914c22
Author: gerd <pokorra at uni-siegen.de>
Date:   Fri Oct 4 16:30:08 2013 +0200

    update to 5.5.0; patch perldoc.pm

 .gitignore   |    1 +
 parrot.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 parrot.spec  |   40 +++++++++++++++++++++++-----------------
 sources      |    3 +--
 4 files changed, 76 insertions(+), 19 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ca3ed51..5ccdca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ parrot-2.9.1.tar.gz
 /parrot-4.9.0.tar.bz2
 /parrot-5.0.0.tar.bz2
 /parrot-5.2.0.tar.bz2
+/parrot-5.5.0.tar.bz2
diff --git a/parrot.patch b/parrot.patch
new file mode 100644
index 0000000..518c3a5
--- /dev/null
+++ b/parrot.patch
@@ -0,0 +1,51 @@
+--- config/auto/perldoc.pm	2013-04-30 21:11:28.000000000 +0200
++++ config/auto/perldoc.pm	2013-10-04 11:03:44.754685587 +0200
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2001-2008, Parrot Foundation.
++# Copyright (C) 2001-2013, Parrot Foundation.
+ 
+ =head1 NAME
+ 
+@@ -38,7 +38,9 @@
+ 
+     my $cmd = File::Spec->catfile($conf->data->get('scriptdirexp_provisional'), q{perldoc});
+     my ( $fh, $filename ) = tempfile( UNLINK => 1 );
+-    my $content = capture_output("$cmd -ud $filename perldoc") || undef;
++    # try to execute 'perldoc perldoc' || 'perldoc Pod::Perldoc' to
++    # read the documentation of perldoc
++    my $content = capture_output("$cmd -ud $filename perldoc") || capture_output("$cmd -ud $filename Pod::Perldoc") || undef;
+ 
+     return 1 unless defined( $self->_initial_content_check($conf, $content) );
+ 
+--- /dev/null	2013-09-04 15:50:10.349997751 +0200
++++ parrot_html.desk.in	2013-10-04 14:50:43.886256122 +0200
+@@ -0,0 +1,13 @@
++
++[Desktop Entry]
++Encoding=UTF-8
++Name=Parrot documentation
++Name[de]=Parrot-Dokumentation
++GenericName=Parrot documentation
++Comment=reading the Parrot documentation (HTML)
++Comment[de]=Lesen der als HTML installierten Parrot-Dokumentation
++Exec=xdg-open /usr/share/doc/parrot/docs/html/index.html
++Icon=gnome-mime-application-pdf
++Terminal=false
++Type=Application
++Categories=Development;
+--- /dev/null	2013-09-04 15:50:10.349997751 +0200
++++ parrot_pdf.desk.in	2013-10-04 15:09:01.854754305 +0200
+@@ -0,0 +1,13 @@
++
++[Desktop Entry]
++Encoding=UTF-8
++Name=Parrot pdf book
++Name[de]=Parrot-PDF-Buch
++GenericName=Parrot pdf book
++Comment=It is a book with only a few chapters. The complete documentation is only available as HTML.
++Comment[de]=Dieses Buch enthält nur wenige Kapitel. Die komplette Dokumentation können Sie nur als HTML lesen.
++Exec=xdg-open /usr/share/doc/parrot/docs/build/parrot-book.pdf
++Icon=gnome-mime-application-pdf
++Terminal=false
++Type=Application
++Categories=Development;
diff --git a/parrot.spec b/parrot.spec
index 5d68f07..bd09ede 100644
--- a/parrot.spec
+++ b/parrot.spec
@@ -1,18 +1,21 @@
 %global __provides_exclude perl\\(DB\\)|perl\\(A\\)|perl\\(B\\)
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           parrot
-Version:        5.2.0
-Release:        4%{?dist}
+Version:        5.5.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/stable/%{version}/parrot-%{version}.tar.bz2
-Source1:        %{name}.desk.in.tar.gz
+Source0:        ftp://ftp.parrot.org/pub/parrot/releases/devel/%{version}/parrot-%{version}.tar.bz2
+
+Patch0:         parrot.patch
+# patched file:           config/auto/perldoc.pm
+# needed to find perldoc documentation with 'perldoc Pod::perldoc'
+# create file:            parrot_html.desk.in
+# create file:            parrot_pdf.desk.in
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  gmp-devel
@@ -32,8 +35,8 @@ BuildRequires:  openssl-devel
 BuildRequires:  flex
 BuildRequires:  bison
 # Needed to generate the Parrot PDF book
-BuildRequires:  perl(Pod::PseudoPod::LaTeX), texlive
-#, texlive-latex-bin
+BuildRequires:  perl(Pod::PseudoPod::LaTeX), texlive, texlive-latex
+#BuildRequires:  perl(Pod::PseudoPod::LaTeX), texlive, texlive-latex-bin
 # Needed to desktop-file-install usage
 BuildRequires:  desktop-file-utils
 
@@ -103,6 +106,7 @@ Parrot Virtual Machine development files for building languages.
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -149,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 
 make install DESTDIR=$RPM_BUILD_ROOT
+
 # remove installed MANIFEST files to avoid having BUILDROOT in installed files
 rm -f $RPM_BUILD_ROOT/usr/share/parrot/%{version}/MANIFEST
 rm -f $RPM_BUILD_ROOT/usr/share/parrot/%{version}/MANIFEST.dev
@@ -234,8 +239,8 @@ find examples -wholename 'examples/languages/abc/t/harness' \
 
 #install desktop file
 %{__mkdir} ${RPM_BUILD_ROOT}%{_datadir}/applications/
-%{__tar} xzf %{SOURCE1} parrot_html.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_pkgdocdir}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_html.desktop
-%{__tar} xzf %{SOURCE1} parrot_pdf.desk.in --to-stdout | %{__sed} "s|@DOCDIR@|%{_pkgdocdir}|g" > ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_pdf.desktop
+%{__install} --mode=644 parrot_html.desk.in ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_html.desktop 
+%{__install} --mode=644 parrot_pdf.desk.in ${RPM_BUILD_ROOT}%{_datadir}/applications/parrot_pdf.desktop 
 
 desktop-file-install --delete-original --add-category="Documentation"  \
     --dir=${RPM_BUILD_ROOT}%{_datadir}/applications                    \
@@ -250,6 +255,7 @@ desktop-file-install --delete-original --add-category="Documentation"  \
 export LD_LIBRARY_PATH=$( pwd )/blib/lib
 FULL='full'
 %{?_without_fulltest: FULL=''}
+#%{?!_without_tests: rm -f t/op/gc-leaky-*.t; make ${FULL}test}
 %{?!_without_tests: rm -f t/op/gc-leaky-*.t; rm -f t/native_pbc/integer.t t/native_pbc/number.t t/native_pbc/string.t t/src/threads_io.t; make ${FULL}test}
 
 
@@ -323,15 +329,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 04  2013 Gerd Pokorra <gp at zimt.uni-siegen.de> - 5.5.0-1
+- update to 5.5.0
+- add patch for config/auto/perldoc.pm
+- provide desktop files with patch, that needed not to be changed
+- remove source1
+
 * Fri Aug 09 2013 Gerd Pokorra <gp at zimt.uni-siegen.de> - 5.2.0-4
 - make unversioned docs and use the new macro _pkgdocdir
 
-* Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 5.2.0-3
-- Perl 5.18 rebuild
-
-* Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 5.2.0-2
-- Perl 5.18 rebuild
-
 * Sat Jun 01 2013 Gerd Pokorra <gp at zimt.uni-siegen.de> - 5.2.0-1
 - update to 5.2.0
 - add BuildRequires perl(Fatal)
@@ -433,7 +439,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0
 
-* Tue Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
+* Fri Jan 23 2009 Reini Urban <rurban at x-ray.at> 0.9.0
 - added parrot_utils to devel
 
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
diff --git a/sources b/sources
index 71b2c34..2e4e16d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ed8e30dda7439f44d6cbf5b3ab40bc28  parrot-5.2.0.tar.bz2
-63344e357df345da0e91cdeb43bc1610  parrot.desk.in.tar.gz
+bd366d0faef0b343756d03a3df58f6e0  parrot-5.5.0.tar.bz2
