From 74a8dfe5617e1c28d7535884f38c05ad74914c4d772baa48f1fd6484bdb4320d Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 27 Jun 2013 21:07:16 +0000 Subject: [PATCH] Accepting request 181206 from home:AndreasStieger:branches:network:utilities - fix factory builds, prevent build failures with pod2man: wireshark-1.10.0-authors-pod2man.patch wireshark-1.10.0-pod-characters.patch OBS-URL: https://build.opensuse.org/request/show/181206 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=91 --- wireshark-1.10.0-authors-pod2man.patch | 50 ++++++++++++++++++++++++ wireshark-1.10.0-pod-characters.patch | 53 ++++++++++++++++++++++++++ wireshark.changes | 7 ++++ wireshark.spec | 8 +++- 4 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 wireshark-1.10.0-authors-pod2man.patch create mode 100644 wireshark-1.10.0-pod-characters.patch diff --git a/wireshark-1.10.0-authors-pod2man.patch b/wireshark-1.10.0-authors-pod2man.patch new file mode 100644 index 0000000..a190798 --- /dev/null +++ b/wireshark-1.10.0-authors-pod2man.patch @@ -0,0 +1,50 @@ +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 diff --git a/wireshark-1.10.0-pod-characters.patch b/wireshark-1.10.0-pod-characters.patch new file mode 100644 index 0000000..451f248 --- /dev/null +++ b/wireshark-1.10.0-pod-characters.patch @@ -0,0 +1,53 @@ +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]'. 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 [-a I] [--asn=I] [B<-d >I] [B<--dbopts=>I] [B<-e >I
] +-[B<--email=>I
] [B<-h>] [B<--help>] [B<-n >I] [B<--name=>I] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] ++B [-a I] [--asn=I] [B<-d >I] [B<--dbopts=>I] [B<-e >I
] ++[B<--email=>I
] [B<-h>] [B<--help>] [B<-n >I] [B<--name=>I] [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 [B<-d >I] [B<--dbopts=>I] [B<-e >I
] [B<--email=>I
] [-i I] +-[--idl=I] [B<-h>] [B<--help>] [B<-n >I] [B<--name=>I] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] ++B [B<-d >I] [B<--dbopts=>I] [B<-e >I
] [B<--email=>I
] [-i I] ++[--idl=I] [B<-h>] [B<--help>] [B<-n >I] [B<--name=>I] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] + + + =head1 DESCRIPTION diff --git a/wireshark.changes b/wireshark.changes index af0220b..4d187d7 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Wed Jun 5 21:08:57 UTC 2013 - andreas.stieger@gmx.de diff --git a/wireshark.spec b/wireshark.spec index 854e797..a6c6b6f 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -28,13 +28,14 @@ Group: Productivity/Networking/Diagnostic 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#/wireshark.keyring # 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/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop 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