From 70a7db4130cf9e719f5dccf8560f13a87a3f3317 Mon Sep 17 00:00:00 2001 From: Radek Vokál Date: Dec 17 2009 09:17:07 +0000 Subject: remove warning dialog, split -devel package --- diff --git a/wireshark-1.2.4-disable_warning_dialog.patch b/wireshark-1.2.4-disable_warning_dialog.patch new file mode 100644 index 0000000..bbf6a49 --- /dev/null +++ b/wireshark-1.2.4-disable_warning_dialog.patch @@ -0,0 +1,34 @@ +diff -up wireshark-1.2.4/gtk/main.c.dialog wireshark-1.2.4/gtk/main.c +--- wireshark-1.2.4/gtk/main.c.dialog 2009-11-16 21:30:43.000000000 +0100 ++++ wireshark-1.2.4/gtk/main.c 2009-12-16 10:53:52.000000000 +0100 +@@ -1227,11 +1227,12 @@ set_display_filename(capture_file *cf) + + GtkWidget *close_dlg = NULL; + +-static void ++/*static void + priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_) + { + recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog); + } ++*/ + + #ifdef _WIN32 + static void +@@ -2559,7 +2560,7 @@ main(int argc, char *argv[]) + main_load_window_geometry(top_level); + + /* Tell the user not to run as root. */ +- if (running_with_special_privs() && recent.privs_warn_if_elevated) { ++/* if (running_with_special_privs() && recent.privs_warn_if_elevated) { + cur_user = get_cur_username(); + cur_group = get_cur_groupname(); + priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, +@@ -2570,6 +2571,7 @@ main(int argc, char *argv[]) + simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); + simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL); + } ++*/ + + #ifdef _WIN32 + /* Warn the user if npf.sys isn't loaded. */ diff --git a/wireshark.spec b/wireshark.spec index 96387f8..506180d 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -12,7 +12,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Applications/Internet %if %{svn_version} @@ -28,8 +28,8 @@ Patch2: wireshark-nfsv4-opts.patch Patch3: wireshark-0.99.7-path.patch Patch4: wireshark-1.1.2-nfs41-backchnl-decode.patch Patch5: wireshark-1.2.4-filter_null.patch - -Patch10: wireshark-1.2.4-enable_lua.patch +Patch6: wireshark-1.2.4-enable_lua.patch +Patch7: wireshark-1.2.4-disable_warning_dialog.patch Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +53,6 @@ BuildRequires: portaudio-devel %if %{with_lua} BuildRequires: lua-devel %endif - Obsoletes: ethereal Provides: ethereal @@ -75,6 +74,11 @@ Requires: portaudio Obsoletes: ethereal-gnome Provides: ethereal-gnome +%package devel +Summary: Development headers and libraries for wireshark +Group: Development/Libraries +Requires: %{name} = %{version} glibc-devel glib2-devel + %description Wireshark is a network traffic analyzer for Unix-ish operating systems. @@ -87,6 +91,11 @@ separately to GTK+ package. %description gnome Contains wireshark for Gnome 2 and desktop integration file +%description devel +The wireshark-devel package contains the header files, developer +documentation, and libraries required for development of wireshark scripts +and plugins. + %prep %if %{svn_version} @@ -101,9 +110,11 @@ Contains wireshark for Gnome 2 and desktop integration file %patch5 -p1 %if %{with_lua} -%patch10 -p1 -b .enable_lua +%patch6 -p1 -b .enable_lua %endif +%patch7 -p1 -b .dialog + %build %ifarch s390 s390x sparcv9 sparc64 export PIECFLAGS="-fPIE" @@ -150,9 +161,6 @@ make DESTDIR=$RPM_BUILD_ROOT install #symlink tshark to tethereal ln -s tshark $RPM_BUILD_ROOT%{_sbindir}/tethereal -#empty?! -rm -f $RPM_BUILD_ROOT%{_sbindir}/idl2wrs - # install support files for usermode, gnome and kde mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark @@ -177,6 +185,56 @@ desktop-file-install --vendor fedora \ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png +#install devel files +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/wireshark +IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark" +mkdir -p "${IDIR}/epan" +mkdir -p "${IDIR}/epan/ftypes" +mkdir -p "${IDIR}/epan/dfilter" +mkdir -p "${IDIR}/wiretap" +install -m 644 color.h "${IDIR}/" +install -m 644 epan/packet.h "${IDIR}/epan/" +install -m 644 epan/prefs.h "${IDIR}/epan/" +install -m 644 epan/proto.h "${IDIR}/epan/" +install -m 644 epan/tvbuff.h "${IDIR}/epan/" +install -m 644 epan/pint.h "${IDIR}/epan/" +install -m 644 epan/to_str.h "${IDIR}/epan/" +install -m 644 epan/value_string.h "${IDIR}/epan/" +install -m 644 epan/column_info.h "${IDIR}/epan/" +install -m 644 epan/frame_data.h "${IDIR}/epan/" +install -m 644 epan/packet_info.h "${IDIR}/epan/" +install -m 644 epan/column-utils.h "${IDIR}/epan/" +install -m 644 epan/epan.h "${IDIR}/epan/" +install -m 644 epan/range.h "${IDIR}/epan/" +install -m 644 epan/gnuc_format_check.h "${IDIR}/epan/" +install -m 644 epan/ipv4.h "${IDIR}/epan" +install -m 644 epan/nstime.h "${IDIR}/epan/" +install -m 644 epan/ipv6-utils.h "${IDIR}/epan/" +install -m 644 epan/guid-utils.h "${IDIR}/epan/" +install -m 644 epan/exceptions.h "${IDIR}/epan/" +install -m 644 epan/address.h "${IDIR}/epan/" +install -m 644 epan/slab.h "${IDIR}/epan/" +install -m 644 epan/except.h "${IDIR}/epan/" +install -m 644 epan/ftypes/ftypes.h "${IDIR}/epan/ftypes/" +install -m 644 epan/dfilter/dfilter.h "${IDIR}/epan/dfilter/" +install -m 644 epan/dfilter/drange.h "${IDIR}/epan/dfilter/" +install -m 644 wiretap/wtap.h "${IDIR}/wiretap/" + +# Create pkg-config control file. +mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig" +cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF" + prefix=%{_prefix} + exec_prefix=%{_prefix} + libdir=%{_libdir} + includedir=%{_includedir} + + Name: %{name} + Description: Network Traffic Analyzer + Version: %{version} + Requires: glib-2.0 + Libs: -L${libdir} -lwireshark -lwiretap + Cflags: -DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan +EOF # Remove .la files rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la @@ -206,23 +264,20 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/tethereal %{_sbindir}/rawshark %{python_sitelib}/* -%{_libdir}/lib* +%{_libdir}/lib*.so.* +%{_libdir}/wireshark/plugins %{_mandir}/man1/editcap.* %{_mandir}/man1/tshark.* -%{_mandir}/man1/idl2wrs.* %{_mandir}/man1/mergecap.* %{_mandir}/man1/text2pcap.* %{_mandir}/man1/capinfos.* %{_mandir}/man1/dumpcap.* %{_mandir}/man4/wireshark-filter.* %{_mandir}/man1/rawshark.* -%{_libdir}/wireshark +#%{_libdir}/wireshark %config(noreplace) %{_sysconfdir}/pam.d/wireshark %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark %{_datadir}/wireshark -%if %{with_lua} -%config(noreplace) %{_datadir}/wireshark/init.lua -%endif %files gnome %defattr(-,root,root) @@ -232,8 +287,23 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/wireshark %{_mandir}/man1/wireshark.* +%files devel +%defattr(-,root,root) +%doc doc/README.* +%{_includedir}/wireshark +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%{_mandir}/man1/idl2wrs.* +%{_sbindir}/idl2wrs +%if %{with_lua} +%config(noreplace) %{_datadir}/wireshark/init.lua +%endif %changelog +* Thu Dec 17 2009 Radek Vokal - 1.2.4-3 +- split -devel package (#547899, #203642, #218451) +- removing root warning dialog (#543709) + * Mon Dec 14 2009 Radek Vokal - 1.2.4-2 - enable lua support - http://wiki.wireshark.org/Lua - attempt to fix filter crash on 64bits