Hello community,
here is the log from the commit of package netpbm for openSUSE:Factory checked
in at 2013-09-11 12:56:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netpbm (Old)
and /work/SRC/openSUSE:Factory/.netpbm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netpbm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/netpbm/netpbm.changes 2013-01-08
14:33:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.netpbm.new/netpbm.changes 2013-09-11
12:56:47.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 11 08:05:40 UTC 2013 - pgaj...@suse.com
+
+- updated to 10.63.01
+ * pngtopam: fix bug: ignores -gamma. Introduced in 10.48
+ (September 2009).
+ * Add pamtowinicon, winicontopam. Thanks Ludolf Holzheid.
+ * pgmnoise: add -maxval, speed up. Thanks Prophet of the Way.
+ * etc. see doc/HISTORY
+- added stdbool-after-jasper.patch, to be removed in the next
+ submission [bnc#839584]
+
+-------------------------------------------------------------------
Old:
----
netpbm-10.61.1-documentation.tar.bz2
netpbm-10.61.1-nohpcdtoppm-noppmtompeg.tar.bz2
New:
----
netpbm-10.63.1-documentation.tar.bz2
netpbm-10.63.1-nohpcdtoppm-noppmtompeg.tar.bz2
netpbm-stdbool-after-jasper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netpbm.spec ++++++
--- /var/tmp/diff_new_pack.sQHvFB/_old 2013-09-11 12:56:48.000000000 +0200
+++ /var/tmp/diff_new_pack.sQHvFB/_new 2013-09-11 12:56:48.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package netpbm
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,11 +17,11 @@
%define libmaj 11
-%define libmin 61
+%define libmin 63
%define libver %{libmaj}.%{libmin}
Name: netpbm
-Version: 10.61.1
+Version: 10.63.1
Release: 0
Summary: A Powerful Graphics Conversion Package
License: BSD-3-Clause and GPL-2.0+ and SUSE-IJG and MIT and
SUSE-Public-Domain
@@ -40,6 +40,9 @@
Patch3: %{name}-tmpfile.patch
Patch4: %{name}-security-code.patch
Patch5: %{name}-security-scripts.patch
+# workaround to #839584 -- just to meet 13.1 beta1 freeze, it
+# can be removed as soon as jasper enters factory
+Patch6: %{name}-stdbool-after-jasper.patch
BuildRequires: flex
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
@@ -112,6 +115,7 @@
%patch3
%patch4 -p1
%patch5 -p1
+%patch6
mkdir pnmtopalm # for %doc pnmtopalm
cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm
++++++ netpbm-10.61.1-documentation.tar.bz2 ->
netpbm-10.63.1-documentation.tar.bz2 ++++++
++++ 2226 lines of diff (skipped)
++++++ netpbm-10.61.1-nohpcdtoppm-noppmtompeg.tar.bz2 ->
netpbm-10.63.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++
++++ 13952 lines of diff (skipped)
++++++ netpbm-security-code.patch ++++++
++++ 1236 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/netpbm/netpbm-security-code.patch
++++ and /work/SRC/openSUSE:Factory/.netpbm.new/netpbm-security-code.patch
++++++ netpbm-security-scripts.patch ++++++
--- /var/tmp/diff_new_pack.sQHvFB/_old 2013-09-11 12:56:50.000000000 +0200
+++ /var/tmp/diff_new_pack.sQHvFB/_new 2013-09-11 12:56:50.000000000 +0200
@@ -1,7 +1,8 @@
-diff -up netpbm-10.47.05/converter/other/anytopnm.security-scripts
netpbm-10.47.05/converter/other/anytopnm
---- netpbm-10.47.05/converter/other/anytopnm.security-scripts 2009-12-10
08:34:36.000000000 +0100
-+++ netpbm-10.47.05/converter/other/anytopnm 2010-03-16 21:28:09.000000000
+0100
-@@ -510,10 +510,7 @@ else
+Index: netpbm-10.63.1/converter/other/anytopnm
+===================================================================
+--- netpbm-10.63.1.orig/converter/other/anytopnm
++++ netpbm-10.63.1/converter/other/anytopnm
+@@ -511,10 +511,7 @@ else
inputFile="-"
fi
@@ -13,7 +14,7 @@
# Take out all spaces
# Find the filename extension for last-ditch efforts later
-@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
+@@ -540,9 +537,17 @@ if [ "$filetype" = "unknown" ]; then
echo "$progname: unknown file type. " \
"'file' says mime type is '$mimeType', " 1>&2
echo "type description is '$typeDescription'" 1>&2
@@ -31,9 +32,10 @@
+fi
+
exit 0
-diff -up netpbm-10.47.05/editor/pamstretch-gen.security-scripts
netpbm-10.47.05/editor/pamstretch-gen
---- netpbm-10.47.05/editor/pamstretch-gen.security-scripts 2009-12-10
08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/pamstretch-gen 2010-03-16 21:28:47.000000000
+0100
+Index: netpbm-10.63.1/editor/pamstretch-gen
+===================================================================
+--- netpbm-10.63.1.orig/editor/pamstretch-gen
++++ netpbm-10.63.1/editor/pamstretch-gen
@@ -31,13 +31,9 @@ if [ "$1" = "" ]; then
exit 1
fi
@@ -49,9 +51,10 @@
if ! cat $2 >$tempfile 2>/dev/null; then
echo 'pamstretch-gen: error reading file' 1>&2
exit 1
-diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts
netpbm-10.47.05/editor/pnmmargin
---- netpbm-10.47.05/editor/pnmmargin.security-scripts 2009-12-10
08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/pnmmargin 2010-03-16 21:28:09.000000000 +0100
+Index: netpbm-10.63.1/editor/pnmmargin
+===================================================================
+--- netpbm-10.63.1.orig/editor/pnmmargin
++++ netpbm-10.63.1/editor/pnmmargin
@@ -11,15 +11,11 @@
# documentation. This software is provided "as is" without express or
# implied warranty.
@@ -90,18 +93,19 @@
-
-
+rm -rf "$tmpdir"
-diff -up netpbm-10.47.05/editor/ppmfade.security-scripts
netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10
08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100
-@@ -14,6 +14,7 @@
+Index: netpbm-10.63.1/editor/ppmfade
+===================================================================
+--- netpbm-10.63.1.orig/editor/ppmfade
++++ netpbm-10.63.1/editor/ppmfade
+@@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@"
#
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+ ##############################################################################
use strict;
+use File::Temp "tempdir";
my $SPREAD = 1;
my $SHIFT = 2;
-@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
+@@ -137,20 +138,26 @@ if ($first_file ne "undefined") {
print("Frames are " . $width . "W x " . $height . "H\n");
@@ -132,7 +136,7 @@
}
#
-@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
+@@ -158,14 +165,14 @@ if ($last_file eq "undefined") {
#
# Here's what our temporary files are:
@@ -155,7 +159,7 @@
my $i; # Frame number
for ($i = 1; $i <= $nframes; $i++) {
-@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
+@@ -173,147 +180,147 @@ for ($i = 1; $i <= $nframes; $i++) {
if ($mode eq $SPREAD) {
if ($i <= 10) {
my $n = $spline20[$i] * 100;
@@ -356,10 +360,11 @@
+system("rm $tmpdir/junk*$$.ppm");
exit(0);
-diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts
netpbm-10.47.05/editor/ppmshadow
---- netpbm-10.47.05/editor/ppmshadow.security-scripts 2009-12-10
08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100
-@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
+Index: netpbm-10.63.1/editor/ppmshadow
+===================================================================
+--- netpbm-10.63.1.orig/editor/ppmshadow
++++ netpbm-10.63.1/editor/ppmshadow
+@@ -97,9 +97,10 @@ sub makeConvolutionKernel($$) {
my $tmpdir = $ENV{TMPDIR} || "/tmp";
++++++ netpbm-stdbool-after-jasper.patch ++++++
Index: converter/other/jpeg2000/jpeg2ktopam.c
===================================================================
--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2013-09-09 15:38:09.189624754
+0200
+++ converter/other/jpeg2000/jpeg2ktopam.c 2013-09-11 09:49:10.017896504
+0200
@@ -12,6 +12,7 @@
/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
#define _XOPEN_SOURCE 600
#include <string.h>
+#include <jasper/jasper.h>
#include "pm_c_util.h"
#include "pam.h"
@@ -19,7 +20,6 @@
#include "nstring.h"
#include "mallocvar.h"
-#include <jasper/jasper.h>
#include "libjasper_compat.h"
enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
Index: converter/other/jpeg2000/pamtojpeg2k.c
===================================================================
--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2013-09-09 15:38:09.189624754
+0200
+++ converter/other/jpeg2000/pamtojpeg2k.c 2013-09-11 09:49:58.475502288
+0200
@@ -12,6 +12,7 @@
/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
#define _XOPEN_SOURCE 600
#include <string.h>
+#include <jasper/jasper.h>
#include "pm_c_util.h"
#include "pam.h"
@@ -19,7 +20,6 @@
#include "nstring.h"
#include "mallocvar.h"
-#include <jasper/jasper.h>
#include "libjasper_compat.h"
++++++ netpbm-tmpfile.patch ++++++
--- /var/tmp/diff_new_pack.sQHvFB/_old 2013-09-11 12:56:50.000000000 +0200
+++ /var/tmp/diff_new_pack.sQHvFB/_new 2013-09-11 12:56:50.000000000 +0200
@@ -15,15 +15,15 @@
===================================================================
--- generator/ppmrainbow.orig
+++ generator/ppmrainbow
-@@ -1,6 +1,7 @@
- #!/usr/bin/perl -wl
+@@ -25,6 +25,7 @@ exec perl -w -x -S -- "$0" "$@"
+ #!/usr/bin/perl
use strict;
use Getopt::Long;
+use File::Temp qw{tempfile tempdir};
my ($FALSE, $TRUE) = (0,1);
-@@ -47,31 +48,25 @@ if (!$norepeat) {
+@@ -71,31 +72,25 @@ if (!$norepeat) {
push @colorlist, $ARGV[0];
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
