From 84ca16eabfd6470a1967456bd082a7f411b208fbdeebd10fcc930f87e9148f4e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 18 Feb 2017 12:03:51 +0000 Subject: [PATCH] Accepting request 457122 from home:scarabeus_iv:branches:network:utilities - Disable gnutls on SLE11 as we are unable to meet the gnutls requirements there OBS-URL: https://build.opensuse.org/request/show/457122 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=199 --- wireshark.changes | 6 ++++++ wireshark.spec | 37 +++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/wireshark.changes b/wireshark.changes index 79c99be..039e3fd 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 14 15:31:44 UTC 2017 - tchvatal@suse.com + +- Disable gnutls on SLE11 as we are unable to meet the gnutls + requirements there + ------------------------------------------------------------------- Tue Jan 24 21:21:42 UTC 2017 - astieger@suse.com diff --git a/wireshark.spec b/wireshark.spec index 38bcd2c..558d4bd 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -25,10 +25,12 @@ %define use_caps 0 # Enable new Qt gui on new releases and build old GTK2 gui on old releases %if 0%{?suse_version} > 1140 +%bcond_without gnutls %bcond_without qt %bcond_with gtk %bcond_without geoip %else +%bcond_with gnutls %bcond_with qt %bcond_without gtk %bcond_with geoip @@ -56,7 +58,6 @@ BuildRequires: hicolor-icon-theme BuildRequires: krb5-devel BuildRequires: libcares-devel BuildRequires: libgcrypt-devel >= 1.1.92 -BuildRequires: libgnutls-devel >= 2.12.0 BuildRequires: libpcap-devel BuildRequires: libsmi-devel BuildRequires: libtool @@ -74,6 +75,9 @@ 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 %if !0%{use_caps} Requires: xdg-utils %else @@ -84,10 +88,6 @@ Requires(pre): permissions BuildRequires: GeoIP-devel Recommends: GeoIP %endif -%if 0%{?suse_version} < 1140 -# GNUTLS 3.0 has incompatible license, yet 3.1 is fine -BuildConflicts: libgnutls-devel >= 3.0.0 -%endif %if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(libnl-3.0) %endif @@ -238,7 +238,11 @@ export PATH="%{_libdir}/qt5/bin:$PATH" --with-qt=no \ %endif --with-ssl \ +%if %{with gnutls} --with-gnutls=yes \ +%else + --with-gnutls=no \ +%endif --with-gcrypt=yes \ --with-plugins=%{_libdir}/%{name}/plugins/%{version} \ --with-pic=yes @@ -246,7 +250,7 @@ export PATH="%{_libdir}/qt5/bin:$PATH" make %{?_smp_mflags} V=1 %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install find %{buildroot} -type f -name "*.la" -delete -print rm -rf %{buildroot}%{_datadir}/%{name}/COPYING @@ -263,11 +267,15 @@ ln -fs tshark %{buildroot}%{_bindir}/tethereal install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_mandir}/man1/ # install separate appdata files corresponding to .desktop files for AppStore integration +%if %{with qt} install -d -m0755 %{buildroot}%{_datadir}/appdata install -m644 wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml sed -i -e "//i \ \ \ \ Wireshark (QT) Network Analyzer<\/name>" \ -e "//i \ \ \ \ QT interface for wireshark network traffic analyzer<\/summary>" \ %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%else +rm -f %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%endif # -devel install -d -m 0755 %{buildroot}%{_includedir}/wireshark @@ -293,7 +301,7 @@ install -m 644 wsutil/*.h "${IDIR}/wsutil" %if %{with gtk} install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark-gtk.png install -D -m 0644 wireshark-gtk.desktop %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop -%suse_update_desktop_file %{name}-gtk +%suse_update_desktop_file -n %{name}-gtk %else # sometimes the gtk.desktop gets autoinstalled by make_install rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop @@ -303,6 +311,8 @@ rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop %suse_update_desktop_file %{name} +%else +rm -f %{buildroot}%{_datadir}/applications/wireshark.desktop %endif %if %{use_caps} @@ -310,13 +320,13 @@ install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wiresh getent group wireshark >/dev/null || groupadd -r wireshark %verifyscript -%{verify_permissions -e %_bindir/dumpcap} +%{verify_permissions -e %{_bindir}/dumpcap} %endif %post %if %{use_caps} %if 0%{?set_permissions:1} > 0 -%set_permissions %_bindir/dumpcap +%set_permissions %{_bindir}/dumpcap %else %run_permissions %endif @@ -389,19 +399,18 @@ exit 0 %defattr(-,root,root) %{_bindir}/wireshark-gtk %{_bindir}/ethereal -%{_datadir}/appdata/wireshark-gtk.appdata.xml %{_datadir}/applications/wireshark-gtk.desktop %{_datadir}/pixmaps/wireshark-gtk.png %post ui-gtk -test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f %{_bindir}/update-mime-database && %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null || : +test -f %{_bindir}/update-desktop-database && %{_bindir}/update-desktop-database > /dev/null || : test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : %postun ui-gtk -test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f %{_bindir}/update-mime-database && %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null || : +test -f %{_bindir}/update-desktop-database && %{_bindir}/update-desktop-database > /dev/null || : test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : %endif