Author: glen Date: Wed Dec 9 08:30:10 2009 GMT Module: packages Tag: HEAD ---- Log message: - use .desktop magic to run root (idea from smart.spec), xterm dep dropped - package libwsutil.so to libwiretap-devel (as .la is already there) - perl -> sed dep - rel 2
---- Files affected: packages/wireshark: wireshark.spec (1.217 -> 1.218) ---- Diffs: ================================================================ Index: packages/wireshark/wireshark.spec diff -u packages/wireshark/wireshark.spec:1.217 packages/wireshark/wireshark.spec:1.218 --- packages/wireshark/wireshark.spec:1.217 Wed Nov 18 09:19:12 2009 +++ packages/wireshark/wireshark.spec Wed Dec 9 09:30:05 2009 @@ -12,18 +12,17 @@ Summary(uk.UTF-8): Аналізатор мережевого трафіку Name: wireshark Version: 1.2.4 -Release: 1 +Release: 2 License: GPL Group: Networking Source0: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 # Source0-md5: ae4533da7d0e54c236e1eed966c42163 -Source1: %{name}.desktop -Source2: %{name}.su-start-script Patch0: %{name}-0.99.5-hip-base05.patch Patch1: %{name}-as_needed.patch Patch2: %{name}-Werror.patch Patch3: %{name}-gcc43.patch Patch4: %{name}-ac.patch +Patch5: %{name}-desktop.patch URL: http://www.wireshark.org/ BuildRequires: adns-devel BuildRequires: autoconf >= 2.52 @@ -42,13 +41,12 @@ BuildRequires: lua51-devel %{?with_snmp:BuildRequires: net-snmp-devel} BuildRequires: pcre-devel -BuildRequires: perl-devel BuildRequires: pkgconfig BuildRequires: portaudio-devel +BuildRequires: sed >= 4.0 BuildRequires: zlib-devel Requires: %{name}-common = %{version}-%{release} Requires: libpcap >= 0.4 -Suggests: xterm Provides: ethereal Provides: ethereal-gnome Obsoletes: ethereal @@ -195,8 +193,8 @@ Summary: Header files for libwiretap packet capture library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libwiretap do przechwytywania pakietów Group: Development/Libraries -Requires: libwiretap = %{version}-%{release} Requires: gtk+2-devel >= 2.0.0 +Requires: libwiretap = %{version}-%{release} %description -n libwiretap-devel Header files for libwiretap packet capture library. @@ -207,13 +205,15 @@ %prep %setup -q +cp wireshark.desktop wireshark-kde.desktop %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -perl -pi -e 's/lua5\.1/lua51/g' acinclude.m4 -find -name Makefile.am | xargs perl -pi -e 's/-Werror//g' +%patch5 -p1 +sed -i -e 's/lua5\.1/lua51/g' acinclude.m4 +find -name Makefile.am | xargs sed -i -e 's/-Werror//g' %build %{__libtoolize} @@ -229,7 +229,7 @@ --with-ssl \ %endif %{!?with_snmp:--without-net-snmp --without-ucdsnmp} \ - --with-lua="/usr" \ + --with-lua=/usr \ --with-plugindir=%{_libdir}/%{name} %{__make} @@ -241,12 +241,10 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}_su -install image/hi48-app-wireshark.png \ - $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png +cp -a image/hi48-app-wireshark.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png +cp -a wireshark-kde.desktop $RPM_BUILD_ROOT%{_desktopdir} -install wiretap/*.h $RPM_BUILD_ROOT%{_includedir}/wiretap +cp -a wiretap/*.h $RPM_BUILD_ROOT%{_includedir}/wiretap # plugins *.la are useless - *.so are loaded through gmodule rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/%{version}*/*.la @@ -266,14 +264,13 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/wireshark -%attr(755,root,root) %{_bindir}/%{name}_su %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/plugins/%{version}* %attr(755,root,root) %{_libdir}/%{name}/plugins/%{version}*/*.so %{_datadir}/%{name} %{_desktopdir}/*.desktop -%{_pixmapsdir}/* +%{_pixmapsdir}/*.png %{_mandir}/man1/wireshark.1* %files common @@ -315,6 +312,7 @@ %files -n libwiretap-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libwiretap.so +%attr(755,root,root) %{_libdir}/libwsutil.so %{_libdir}/libwiretap.la %{_libdir}/libwsutil.la %{_includedir}/wiretap @@ -325,6 +323,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.218 2009/12/09 08:30:05 glen +- use .desktop magic to run root (idea from smart.spec), xterm dep dropped +- package libwsutil.so to libwiretap-devel (as .la is already there) +- perl -> sed dep +- rel 2 + Revision 1.217 2009/11/18 08:19:12 adamg - updated to 1.2.4 @@ -384,7 +388,7 @@ Revision 1.199 2008/12/21 09:53:31 arekm - up to 1.0.5 (security fixes) -[CVE-2008-5285] + [CVE-2008-5285] Revision 1.198 2008/12/01 09:29:39 blues - security blocker @@ -397,8 +401,8 @@ Revision 1.195 2008/10/21 10:34:13 adamg - updated to 1.0.4 -[WNPA-SEC-2008-06, i.e. CVE-2008-4680 CVE-2008-4681 CVE-2008-4682 - CVE-2008-4683 CVE-2008-4684 CVE-2008-4685] + [WNPA-SEC-2008-06, i.e. CVE-2008-4680 CVE-2008-4681 CVE-2008-4682 + CVE-2008-4683 CVE-2008-4684 CVE-2008-4685] Revision 1.194 2008/09/17 21:07:07 qboosh - pl fix @@ -416,14 +420,14 @@ Revision 1.191 2008/09/07 14:53:46 adamg - updated to 1.0.3 [fixes WNPA-SEC-2008-05] -[i.e. CVE-2008-3146 CVE-2008-3932 CVE-2008-3933 CVE-2008-3934] + [i.e. CVE-2008-3146 CVE-2008-3932 CVE-2008-3933 CVE-2008-3934] Revision 1.190 2008/07/16 16:46:42 twittner - works, rel. 1 Revision 1.189 2008/07/14 22:20:20 twittner - up to 1.0.2 (fixes CVE-2008-3140) -[and CVE-2008-3137 CVE-2008-3138 CVE-2008-3139 CVE-2008-3141 CVE-2008-3145] + [and CVE-2008-3137 CVE-2008-3138 CVE-2008-3139 CVE-2008-3141 CVE-2008-3145] - rel. 0.1 (builds, it's too late for testing) Revision 1.188 2008/07/09 08:00:08 megabajt ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wireshark/wireshark.spec?r1=1.217&r2=1.218&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
