rpms/parrot/F-10 parrot-1.x.0.patch,1.1,1.2 parrot.spec,1.5,1.6

Gerd Pokorra gerd at fedoraproject.org
Tue Aug 4 08:29:17 UTC 2009


Author: gerd

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

Modified Files:
	parrot-1.x.0.patch parrot.spec 
Log Message:
update to 1.4.0-8; changes the place of header-files and add the module "Parrot::OpLib::core"

parrot-1.x.0.patch:
 config/gen/makefiles/parrot_pc.in |    2 +-
 lib/Parrot/Install.pm             |   10 ++++++++++
 tools/dev/install_files.pl        |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: parrot-1.x.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot-1.x.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parrot-1.x.0.patch	21 Jul 2009 16:48:52 -0000	1.1
+++ parrot-1.x.0.patch	4 Aug 2009 08:29:16 -0000	1.2
@@ -1,14 +1,6 @@
---- tools/dev/install_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_files.pl	2009-06-02 16:12:00.000000000 +0200
-@@ -133,7 +133,6 @@
-         transform => sub {
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
-@@ -157,7 +156,7 @@
+--- 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.
@@ -17,16 +9,14 @@
              return($filehash);
          },
      },
---- tools/dev/install_dev_files.pl	2009-06-01 09:29:54.000000000 +0200
-+++ tools/dev/install_dev_files.pl	2009-06-02 16:19:07.000000000 +0200
-@@ -124,7 +124,6 @@
-             my($filehash) = @_;
-             $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
-             $filehash->{Dest} =~ s/^include//;
--            $filehash->{DestDirs} = [$parrotdir];
-             return($filehash);
-         },
-     },
+--- config/gen/makefiles/parrot_pc.in	2009-06-06 16:33:32.000000000 +0200
++++ config/gen/makefiles/parrot_pc.in.new	2009-07-13 23:09:45.000000000 +0200
+@@ -7,4 +7,4 @@
+ Description: virtual machine to execute bytecode for interpreted languages
+ Version: @VERSION@
+ Libs: -L${libdir} -lparrot @icu_shared@ @libs@
+-Cflags: -I${includedir}
++Cflags: -I${includedir}@versiondir@
 --- 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 @@
@@ -46,13 +36,3 @@
              copy( $src, $dest ) or die "Error: couldn't copy $src to $dest: $!\n";
              print "$dest\n";
          }
---- MANIFEST.generated	2009-07-14 23:49:14.000000000 +0200
-+++ MANIFEST.generated.new	2009-07-17 13:39:08.000000000 +0200
-@@ -241,5 +241,6 @@
- src/pmc/sub.dump                                  [devel]src
- src/pmc/undef.dump                                [devel]src
- src/string_private_cstring.h                      []
--tools/build/dynpmc.pl                             []
-+tools/build/dynoplibs.pl                          [devel]
-+tools/build/dynpmc.pl                             [devel]
- vtable.dump                                       [devel]src


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/F-10/parrot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- parrot.spec	1 Aug 2009 12:26:46 -0000	1.5
+++ parrot.spec	4 Aug 2009 08:29:16 -0000	1.6
@@ -1,29 +1,25 @@
 Name:           parrot
 Version:        1.4.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Parrot is 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
 
 Patch0:         parrot-1.x.0.patch
-# see for upstream:       https://trac.parrot.org/parrot/ticket/735
-# patched files:          tools/dev/install_files.pl
-#                         tools/dev/install_dev_files.pl
-# Changes the path for header files (to have no version subdirectory)
-# It is also responsible to have no subdirectory under pkgconfig.
+# patches file:           tools/dev/install_files.pl
+# It is responsible to have no subdirectory under pkgconfig.
+#
+# patches file:           config/gen/makefiles/parrot_pc.in
+# So "pkg-config parrot --cflags" works correct
 #
 # 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}  
-#
-# see for upstream:       https://trac.parrot.org/parrot/ticket/844
-# patched file:           MANIFEST.generated
-# Add two perl-srcipts that are need to build Rakudo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
@@ -61,11 +57,13 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl(Pod::Simple)
 Requires:       perl(File::Which) >= 0.05
+Requires:       perl(Parrot::OpLib::core)
 # It is necessary to have installed the package "perl-Perl-Critic" to install
 # the parrot-tools
 Provides:       perl(Parrot::Pmc2c::MethodEmitter) = %{version}
 Provides:       perl(Parrot::Pmc2c::PCCMETHOD_BITS) = %{version}
 Provides:       perl(Parrot::Pmc2c::PMCEmitter) = %{version}
+Provides:       perl(Parrot::OpLib::core) = %{version}
 
 
 %description
@@ -94,15 +92,13 @@ Parrot Virtual Machine development files
 %setup -q
 %patch0 -p0
 
-%{__perl} -pi -e 's,"lib/,"%{_lib}/, if (/CONST_STRING\(interp,/)' \
-    src/library.c
-%{__perl} -pi -e "s,'/usr/lib','%{_libdir}',;s,runtime/lib/,runtime/%{_lib}/," \
-    tools/dev/install_files.pl
+%{__perl} -pi -e "s,'/usr/lib','%{_libdir}'," tools/dev/install_files.pl
 
 
 cat << \EOF > %{name}-prov
 #!/bin/sh
-%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' -e '/perl(DB)/d'
+%{__perl_provides} $* | %{__sed} -e '/perl(A)/d' -e '/perl(B)/d' \
+                            -e '/perl(DB)/d' -e '/perl(Parrot::OpLib::core)/d'
 EOF
 
 %global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
@@ -181,12 +177,6 @@ find %{RPM_PAR_LIB_DIR}tools -type f -na
 find %{RPM_PAR_LIB_DIR}tools/dev -type f -name "pbc_to_exe.pir" \
     -exec %{__sed} -i -e '1 s&#! parrot&#!/usr/bin/parrot&' {} \; \
     -exec chmod 755 {} \;
-# Set path to perl binary
-find %{RPM_PAR_LIB_DIR}tools/build -type f -name "dyn*.pl" \
-    -exec %{__sed} -i -e '1 s&# ex: set ro:&#!/usr/bin/perl&' {} \; 
-# This module is only needed for building and should not be installed (I think)
-# module "Parrot::OpLib::core"
-rm -rf %{RPM_PAR_LIB_DIR}tools/lib/Parrot/OpLib
 
 # Remove doc-files with zero-length
 find docs/html -type f -size 0 -exec rm -f {} \;
@@ -225,9 +215,6 @@ for file in docs/book/draft/ch05_pge.pod
 done
 %{__rm} -f timestamp
 
-# These files *probably* aren't needed.
-rm -rf $RPM_BUILD_ROOT%{_usr}/config \
-    $RPM_BUILD_ROOT%{_includedir}/src
 
 %check
 # 'make fulltest' is done by default; it take a lot of time
@@ -250,10 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog CREDITS NEWS PBC_COMPAT PLATFORMS README
 %doc RESPONSIBLE_PARTIES TODO LICENSE
-%exclude %{_bindir}/parrot_config
-%exclude %{_bindir}/parrot_debugger
-%exclude %{_bindir}/pbc_*
-%{_bindir}/*
+%{_bindir}/parrot
 %{_libdir}/parrot/
 %exclude %{_libdir}/parrot/%{version}/tools
 %exclude %{_libdir}/parrot/%{version}/VERSION
@@ -273,22 +257,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pbc_to_exe
 %{_bindir}/pbc_dump
 %{_includedir}/parrot
-%{_includedir}/pmc
 %{_libdir}/libparrot.so
 %exclude %{_libdir}/libparrot.a
 %{_libdir}/pkgconfig/*
-%{_usr}/src/parrot/*
 
 %files tools
 %defattr(-,root,root,-)
 # Files for building languages
 %{_libdir}/parrot/%{version}/tools/*
 %{_libdir}/parrot/%{version}/VERSION
-
+%{_usr}/src/parrot/*
 
 
 %changelog
-* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-5
+* Sat Aug 1 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-8
+- include the necessary module Parrot::OpLib::core
+- change the place of header files to /usr/include/parrrot/<version>
 - install the files /usr/src/parrot/*
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
@@ -297,14 +281,11 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 21 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.4.0-1
 - add the new disable-rpath configure option
 
-* Thu Apr 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
+* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-6
 - add a list of changes from Lubomir Rintel
-- add patch to remove rpath
 - add filtering Provides
 - change requires for docs-subpackage
 - enable test suite
-
-* Wed Mar 25 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.0.0-5
 - change the group of the subpackage "-docs" to Documentation
 - put the main-documentation from the docs-package to the main package
 - LICENSE file added
@@ -315,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT
 - define RPM_PAR_LIB_DIR added
 - add subpackage "tools"
 - exclude tools directory from main-package
+- added make html
 
 * Sun Mar 22 2009 Fabien Georget <fabien.georget at gmail.com> 1.0.0-4
 - add tools
@@ -322,11 +304,8 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-3
 - Removed wrong prefix from pkgconfig per Christoph Wickert
 - Changed i386 to ix86 per Christoph Wickert
-
-* Sun Mar 22 2009 David Fetter <david at fetter.org> 1.0.0-2
 - Changed hard-coded path requirement to perl.
 
-
 * Tue Mar 17 2009 Allison Randal <allison at parrot.org> 1.0.0
 - updated to 1.0.0
 
@@ -335,50 +314,29 @@ rm -rf $RPM_BUILD_ROOT
 - added parrot_utils to devel
 - fixed Source0 url
 
-* Tue Jan 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.9.0
-- added make html
-- make reallyinstall => make install
-
 * Tue Dec 16 2008 Whiteknight <wknight8111 at gmail.com> 0.8.2
 - updated to 0.8.2
 
-* Tue Oct 21 2008 particle <particle at parrot.org> 0.8.0
-- updated to 0.8.0
-
 * Tue Mar 18 2008 Bernhard Schmalhofer <Bernhard.Schmalhofer at gmx.de> 0.6.0
 - Update to 0.5.3.
 
 * Wed Feb 20 2008 Patrick Michaud <pmichaud at pobox.com> 0.5.3
 - Update to 0.5.3.
 
-* Tue Jan 15 2008 Bob Rogers <rogers at rgrjr.dyndns.org> 0.5.2
-- Update to 0.5.2.
-
-* Tue Dec 18 2007 Jonathan Worthington <jnthn at jnthn.net> 0.5.1
-- Update to 0.5.1.
-
 * 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.
-
-* Fri Jun 30 2006 Steven Pritchard <steve at kspei.com> 0.4.5-5
 - Override lib_dir and make various substitutions to try to fix multilib.
 - Remove rpath use from Makefile.
 - Fix a pod error in src/ops/experimental.ops.
 - Enable "make test" since t/doc/pod.t won't fail now.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-4
 - Force permissions on shared libraries so rpmbuild strips them.
-
-* Wed Jun 28 2006 Steven Pritchard <steve at kspei.com> 0.4.5-3
 - Fix URL, description, summary, etc.
 - Add post/postun.
 - Move parrot-config to the devel sub-package.
 - Force permissions on the doc directories.
-
-* Tue Jun 27 2006 Steven Pritchard <steve at kspei.com> 0.4.5-2
 - Add -lcurses to get readline detection to work.
 - Add BuildRequires libicu-devel.
 




More information about the fedora-extras-commits mailing list