rpms/wireshark
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Move plugins to %{_libdir}/wireshark/plugins to avoid transaction conflicts

Browse Source
This commit is contained in:
Peter Hatina 2015-07-01 09:56:49 +02:00
parent 22f47f873a
commit d419506eba
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wireshark.spec
View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.12.6 Version: 1.12.6
Release: 3%{?dist} Release: 4%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -217,7 +217,7 @@ autoreconf -ivf
%endif %endif
--with-ssl \ --with-ssl \
--disable-warnings-as-errors \ --disable-warnings-as-errors \
--with-plugins=%{_libdir}/%{name}/plugins/current \ --with-plugins=%{_libdir}/%{name}/plugins \
--enable-airpcap --enable-airpcap
#remove rpath #remove rpath
@ -227,9 +227,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
# The evil plugins hack
perl -pi -e 's|-L../../epan|-L../../epan/.libs|' plugins/*/*.la
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
make DESTDIR=%{buildroot} install_desktop_files make DESTDIR=%{buildroot} install_desktop_files
@ -264,11 +261,6 @@ install -m 644 wsutil/*.h "${IDIR}/wsutil"
install -m 644 ws_symbol_export.h "${IDIR}/" install -m 644 ws_symbol_export.h "${IDIR}/"
install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d/ install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d/
# Link current plugins directory to %{version}
pushd %{buildroot}/%{_libdir}/%{name}/plugins
ln -s current %{version}
popd
# Register as an application to be visible in the software center # Register as an application to be visible in the software center
# #
# NOTE: It would be *awesome* if this file was maintained by the upstream # NOTE: It would be *awesome* if this file was maintained by the upstream
@ -308,7 +300,7 @@ SentUpstream: 2014-09-18
EOF EOF
# Remove .la files # Remove .la files
rm -f %{buildroot}%{_libdir}/%{name}/plugins/%{version}/*.la rm -f %{buildroot}%{_libdir}/%{name}/plugins/*.la
# Remove .la files in libdir # Remove .la files in libdir
rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
@ -365,6 +357,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{python_sitearch}/*.py* %{python_sitearch}/*.py*
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_libdir}/wireshark %{_libdir}/wireshark
%{_libdir}/wireshark/plugins
%{_mandir}/man1/editcap.* %{_mandir}/man1/editcap.*
%{_mandir}/man1/tshark.* %{_mandir}/man1/tshark.*
%{_mandir}/man1/mergecap.* %{_mandir}/man1/mergecap.*
@ -415,6 +408,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Tue Jun 30 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-4
- Move plugins to %{_libdir}/wireshark/plugins to avoid
transaction conflicts
* Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-3 * Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-3
- Disable overlay scrolling in main window - Disable overlay scrolling in main window
- Resolves: rhbz#1235830 - Resolves: rhbz#1235830