From e26d534ec8de92b074a2fff5fc3a98f996ad6402fe55b5dd38597446e92bd5b7 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Thu, 27 Jul 2017 08:22:12 +0000
Subject: [PATCH] clean, SLE 11

OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=221
---
 wireshark.changes |  2 +-
 wireshark.spec    | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/wireshark.changes b/wireshark.changes
index c6f7370..708e6e2 100644
--- a/wireshark.changes
+++ b/wireshark.changes
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Thu Jul 27 08:06:59 UTC 2017 - astieger@suse.com
+Thu Jul 27 08:21:59 UTC 2017 - astieger@suse.com
 
 - Wireshark 2.4.0:
   * SS7 Point Codes can now be resolved into names with a hosts-
diff --git a/wireshark.spec b/wireshark.spec
index 2428290..774c065 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -39,7 +39,7 @@ Name:           wireshark
 Version:        2.4.0
 Release:        0
 Summary:        A Network Traffic Analyser
-License:        GPL-2.0+ and GPL-3.0+
+License:        GPL-2.0+ AND GPL-3.0+
 Group:          Productivity/Networking/Diagnostic
 Url:            https://www.wireshark.org/
 Source:         https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
@@ -74,7 +74,6 @@ Requires(pre):  shadow
 Recommends:     wireshark-ui = %{version}
 Provides:       ethereal = %{version}
 Obsoletes:      ethereal < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with gnutls}
 BuildRequires:  libgnutls-devel >= 2.12.0
 %endif
@@ -108,6 +107,9 @@ BuildRequires:  lua52-devel
 %else
 BuildRequires:  lua-devel
 %endif
+%if 0%{?suse_version} <= 1110
+BuildRequires:  xz
+%endif
 
 %description
 Wireshark is a free network protocol analyzer for Unix and Windows. It
@@ -348,7 +350,6 @@ exit 0
 %postun -n %{libcodecs} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README README.linux README.vmware
 %{_mandir}/man1/[^i]*
 %{_mandir}/man4/*
@@ -378,23 +379,18 @@ exit 0
 %{_datadir}/mime/packages/wireshark.xml
 
 %files -n %{libutil}
-%defattr(-,root,root)
 %{_libdir}/libwsutil*.so.*
 
 %files -n %{libwire}
-%defattr(-,root,root)
 %{_libdir}/libwireshark.so.*
 
 %files -n %{libtap}
-%defattr(-,root,root)
 %{_libdir}/libwiretap.so.*
 
 %files -n %{libcodecs}
-%defattr(-,root,root)
 %{_libdir}/libwscodecs.so.*
 
 %files devel
-%defattr(-,root,root)
 %doc doc/README.*
 %{_includedir}/wireshark
 %{_libdir}/lib*.so
@@ -402,7 +398,6 @@ exit 0
 
 %if %{with gtk}
 %files ui-gtk
-%defattr(-,root,root)
 %{_bindir}/wireshark-gtk
 %{_bindir}/ethereal
 %{_datadir}/applications/wireshark-gtk.desktop
@@ -426,7 +421,6 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
 
 %if %{with qt}
 %files ui-qt
-%defattr(-,root,root)
 %{_bindir}/wireshark
 %{_bindir}/ethereal
 %dir %{_datadir}/appdata