Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2013-06-29 14:52:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2013-06-06 13:00:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2013-06-29 14:52:54.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 27 20:26:33 UTC 2013 - andreas.stieger@gmx.de
+
+- fix factory builds, prevent build failures with pod2man:
+ wireshark-1.10.0-authors-pod2man.patch
+ wireshark-1.10.0-pod-characters.patch
+
+-------------------------------------------------------------------
New:
----
wireshark-1.10.0-authors-pod2man.patch
wireshark-1.10.0-pod-characters.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.0REMd5/_old 2013-06-29 14:52:56.000000000 +0200
+++ /var/tmp/diff_new_pack.0REMd5/_new 2013-06-29 14:52:56.000000000 +0200
@@ -28,13 +28,14 @@
Url: https://www.wireshark.org/
Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt
-# https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg
-Source3: wireshark.keyring
+Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshar...
# PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root
Patch1: wireshark-1.2.0-disable-warning-dialog.patch
# PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak@suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders
Patch2: wireshark-1.2.0-geoip.patch
Patch4: wireshark-1.10.0-enable_lua.patch
+Patch5: wireshark-1.10.0-authors-pod2man.patch
+Patch6: wireshark-1.10.0-pod-characters.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
@@ -122,6 +123,9 @@
sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop
%endif
+%patch5 -p1
+%patch6 -p1
+
%build
# zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2
++++++ wireshark-1.10.0-authors-pod2man.patch ++++++
From: Andreas Stieger
Date: Thu, 27 Jun 2013 21:02:17 +0100
Subject: [patch] change characters in AUTHORS file to be compatible with pod2man
Upstream: never
* remove some characters for which Pod::Man does not have an escape sequence
* replace cyrillic name with transliteration
Wide character in printf at /usr/lib/perl5/5.18.0/Pod/Simple.pm line 539.
wireshark.pod around line 3455: Non-ASCII character seen before =encoding in 'Moń'. Assuming UTF-8
POD document had syntax errors at /usr/bin/pod2man line 71.
make: *** [wireshark.1] Error 255
error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build)
---
AUTHORS | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: wireshark-1.10.0/AUTHORS
===================================================================
--- wireshark-1.10.0.orig/AUTHORS 2013-05-29 17:52:27.000000000 +0100
+++ wireshark-1.10.0/AUTHORS 2013-06-27 20:04:34.000000000 +0100
@@ -3509,7 +3509,7 @@ Peter Hatina {
Gtk3 Wireshark fixes
}
-Tomasz Moń {
+Tomasz Mon {
USBPcap support
}
@@ -3612,7 +3612,7 @@ Cvetan Ivanov
Vasanth Manickam
Julian Onions
Samuel Thibault
-Peter Kovář
+Peter Kovár
Paul Ollis
Dominik Kuhlen
Karl Knoebl
@@ -3703,7 +3703,7 @@ Paul Stath
DeCount
Andras Veres-Szentkiralyi
Jakob Hirsch
-Роман Донченко
+Roman Donchenko
Evan Huus
Tom Cook
++++++ wireshark-1.10.0-pod-characters.patch ++++++
From: Andreas Stieger
Date: Thu, 27 Jun 2013 21:02:17 +0100
Subject: [patch] prevent pod2man failures due to non-ASCII characters
References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=49424
Upstream: submitted (different patch upstream but creates other errors)
Prevents the following error sue to weird whitespache characters in the file:
POD2MAN asn2deb.1
asn2deb.pod around line 8: Non-ASCII character seen before =encoding in '[-a?II<opts>]'. Assuming ISO8859-1
POD document had syntax errors at /usr/bin/pod2man line 71.
make: *** [idl2deb.1] Error 255
---
doc/asn2deb.pod | 4 ++--
doc/idl2deb.pod | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: wireshark-1.10.0/doc/asn2deb.pod
===================================================================
--- wireshark-1.10.0.orig/doc/asn2deb.pod 2013-06-27 20:33:01.000000000 +0100
+++ wireshark-1.10.0/doc/asn2deb.pod 2013-06-27 20:33:42.000000000 +0100
@@ -5,8 +5,8 @@ asn2deb - Create a Debian package for BE
=head1 SYNOPSIS
-B<asn2deb> [-a�I] [--asn=I] [B<-d�>I<opts>] [B<--dbopts=>I<opts>] [B<-e�>I<address>]
-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n�>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+B<asn2deb> [-a I] [--asn=I] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
+[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
=head1 DESCRIPTION
Index: wireshark-1.10.0/doc/idl2deb.pod
===================================================================
--- wireshark-1.10.0.orig/doc/idl2deb.pod 2013-06-27 20:33:01.000000000 +0100
+++ wireshark-1.10.0/doc/idl2deb.pod 2013-06-27 20:33:42.000000000 +0100
@@ -5,8 +5,8 @@ idl2deb - Create a Debian package for CO
=head1 SYNOPSIS
-B<idl2deb> [B<-d�>I<opts>] [B<--dbopts=>I<opts>] [B<-e�>I<address>] [B<--email=>I<address>] [-i�I<idlfile>]
-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n�>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
+[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
=head1 DESCRIPTION
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org