From e4f1d1a67cc4682d9d2cbfa699efd01a40e800b1b3e99ac3ecab42a7ba8e1882 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 20 Jun 2009 02:08:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=21 --- wireshark-1.2.0-geoip.patch | 12 ++++++++++++ wireshark.changes | 6 ++++++ wireshark.spec | 11 ++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 wireshark-1.2.0-geoip.patch diff --git a/wireshark-1.2.0-geoip.patch b/wireshark-1.2.0-geoip.patch new file mode 100644 index 0000000..5099910 --- /dev/null +++ b/wireshark-1.2.0-geoip.patch @@ -0,0 +1,12 @@ +--- epan/geoip_db.c ++++ epan/geoip_db.c +@@ -160,6 +160,9 @@ + geoip_dat_scan_dir(geoip_db_paths[i].path); + } + } ++ if (num_geoip_db_paths < 1) { ++ geoip_dat_scan_dir("/var/lib/GeoIP"); ++ } + + /* add fake databases for latitude and longitude (using "City" in reality) */ + { diff --git a/wireshark.changes b/wireshark.changes index 180fb29..b8b7624 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 17 17:13:53 CEST 2009 - prusnak@suse.cz + +- search in /var/lib/GeoIP if user hasn't set any GeoIP folders + (geoip.patch) + ------------------------------------------------------------------- Wed Jun 17 12:36:52 CEST 2009 - prusnak@suse.cz diff --git a/wireshark.spec b/wireshark.spec index 5d3973f..7cb6fcd 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -23,13 +23,18 @@ License: GPL v2 or later Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser Version: 1.2.0 -Release: 1 +Release: 2 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source1: include.filelist +# PATCH-FIX-OPENSUSE wireshark-1.0.8-desktop.patch bnc#349782 prusnak@suse.cz -- fix icon and run as root Patch0: %{name}-1.0.8-desktop.patch +# PATCH-FIX-OPENSUSE wireshark-1.2.0-disable-warning-dialog.patch bnc#349782 prusnak@suse.cz -- don't show warning when running as root Patch1: %{name}-1.2.0-disable-warning-dialog.patch +# PATCH-FIX-OPENSUSE wireshark-1.2.0-asneeded.patch cmorve69@yahoo.es -- compile with --as-needed Patch2: %{name}-1.2.0-asneeded.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 +Patch3: %{name}-1.2.0-geoip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: xdg-utils Provides: ethereal = %{version} @@ -145,6 +150,7 @@ Authors: %patch0 %patch1 %patch2 +%patch3 %build %configure @@ -194,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Jun 17 2009 prusnak@suse.cz +- search in /var/lib/GeoIP if user hasn't set any GeoIP folders + (geoip.patch) +* Wed Jun 17 2009 prusnak@suse.cz - updated to 1.2.0 Bug Fixes Too many bugs have been fixed since the 1.0 release to list here.