Hello community, here is the log from the commit of package perl-Prima for openSUSE:Factory checked in at 2012-06-06 10:28:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Prima (Old) and /work/SRC/openSUSE:Factory/.perl-Prima.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Prima", Maintainer is "jw@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Prima/perl-Prima.changes 2011-12-06 13:53:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Prima.new/perl-Prima.changes 2012-06-06 10:29:09.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jun 2 22:41:48 UTC 2012 - frank.lichtenheld@sophos.com + +- Update to 1.34 +* 1.34: Unicode fixes, ready for 5.16 +* 1.33: Image codecs: remove prigraph, add XBM, and enhance TIFF support + Add RubberBand.pm +- Clean up spec file, removing cruft +- Run X11 based tests with Xvfb + +------------------------------------------------------------------- Old: ---- Prima-1.32.tar.gz happy-gcc-during_make.diff New: ---- Prima-1.34.tar.gz gcc-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Prima.spec ++++++ --- /var/tmp/diff_new_pack.xphSHk/_old 2012-06-06 10:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.xphSHk/_new 2012-06-06 10:29:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Prima # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-Prima -BuildRequires: giflib-devel libpng-devel libtiff-devel perl xorg-x11 xorg-x11-devel -License: BSD-3-Clause -Group: Development/Libraries/Perl +BuildRequires: giflib-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: perl +BuildRequires: xkeyboard-config +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-Xvfb +BuildRequires: xorg-x11-devel +%define X_display ":98" Requires: xorg-x11 -Version: 1.32 -Release: 1 +Version: 1.34 +Release: 0 Summary: A Perl toolkit for multi-platform GUI development +License: BSD-3-Clause +Group: Development/Libraries/Perl Url: http://prima.eu.org Source: http://www.cpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz Source1: VB_classes-decent.gif Source2: Prima.pdf.bz2 -Source3: happy-gcc-during_make.diff Patch: VB-decent.diff Patch2: Prima-GenericEvent.patch +Patch3: gcc-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-base = %perl_version @@ -48,46 +54,33 @@ cp %{S:1} Prima/VB/classes.gif cp %{S:2} . bunzip2 Prima.pdf.bz2 -cp %{S:3} . %patch -p1 %patch2 +%patch3 -p1 # patch creates a .orig file. Our Installer is so greedy ... rm -f Prima/VB/VB.pl.orig -echo _bindir= %{_bindir} -echo _libdir= %{_libdir} -echo perl_vendorlib= %{perl_vendorlib} -echo perl_vendorarch= %{perl_vendorarch} %build -## man1+man3 try to hide in perl_vendorarch if PREFIX is set. force them back. -M=$RPM_BUILD_ROOT/%{_mandir} -MAKEFILE_ARGS="PREFIX=$RPM_BUILD_ROOT/usr INSTALL_MAN1=$M/man1 INSTALL_MAN3=$M/man3" -if [ "%_lib" = "lib64" ]; then - MAKEFILE_ARGS="$MAKEFILE_ARGS LIBPATH+=/usr/X11/lib64" -fi -perl Makefile.PL $MAKEFILE_ARGS +perl Makefile.PL ## site_perl is not allowed anymore in SuSE Linux. perl -i -pe 's{/site_perl/}{/vendor_perl/}g' Makefile make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS -Wall" (ldd auto/Prima/Prima.so | grep -q libgif ) || echo "WARNING: gif codec required for VB" %check -# giflib-4.1.3:EGifCompressLine is not 64bit save. +############################################# +### Launch a virtual framebuffer X server ### +############################################# +export DISPLAY=%{X_display} +Xvfb %{X_display} >& Xvfb.log & +trap "kill $! || true" EXIT +sleep 10 make test -### only three basic tests work without a DISPLAY. -### ... or more powerful tests: -## neededforbuild xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-scalable xorg-x11-server -## -## Xvfb :95 -fp /usr/X11R6/lib/X11/fonts/misc & -## trap "kill $!" EXIT -## sleep 5 -## DISPLAY=:95 make test -## %install -make install -## oops, Prima/Config.PL must not contain BUILD_ROOT -perl -ne 'print qq{$1\n} if m{--updateconfig\s+(\S+)}' Makefile | xargs perl -i -pe "s{$RPM_BUILD_ROOT}"'{}g' +%perl_make_install +## oops, Prima/Config.pm must not contain BUILD_ROOT +find $RPM_BUILD_ROOT -name 'Config.pm' -print0 | xargs -0 perl -i -pe "s{\\Q$RPM_BUILD_ROOT}"'{}g' ### ### should these go to a perl-Prima-devel ? find $RPM_BUILD_ROOT/%{perl_vendorarch} -name \*.h | xargs -t rm ++++++ Prima-1.32.tar.gz -> Prima-1.34.tar.gz ++++++ ++++ 5435 lines of diff (skipped) ++++++ gcc-warnings.patch ++++++ diff -ur Prima-1.34.orig/img/codec_tiff.c Prima-1.34/img/codec_tiff.c --- Prima-1.34.orig/img/codec_tiff.c 2012-05-24 09:30:17.000000000 +0200 +++ Prima-1.34/img/codec_tiff.c 2012-06-02 23:54:05.000000000 +0200 @@ -584,6 +584,8 @@ (f << 24) ; } + + return true; } static Bool -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org