SPECS: wireshark.spec - merge -tools into -common RATIONALE: twireshark r...

Wed Sep 17 22:22:08 CEST 2008

Author: adamg                        Date: Wed Sep 17 20:22:08 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge -tools into -common
  RATIONALE: twireshark requires /usr/bin/dumpcap from wireshark-tools, 
  seems like there is no point in having both -common and -tools as they 
  are required by both wireshark and twireshark, and you can live with
  an extra ~250 kb in a 24 MB -common package
- release 2

---- Files affected:
SPECS:
   wireshark.spec (1.192 -> 1.193) 

---- Diffs:

================================================================
Index: SPECS/wireshark.spec
diff -u SPECS/wireshark.spec:1.192 SPECS/wireshark.spec:1.193

--- SPECS/wireshark.spec:1.192	Mon Sep  8 10:34:39 2008
+++ SPECS/wireshark.spec	Wed Sep 17 22:22:03 2008
@@ -13,7 +13,7 @@
 Summary(uk.UTF-8):	Аналізатор мережевого трафіку
 Name:		wireshark
 Version:	1.0.3
-Release:	1
+Release:	3
 License:	GPL
 Group:		Networking
 Source0:	http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -50,7 +50,6 @@
 BuildRequires:	portaudio-devel
 BuildRequires:	zlib-devel
 Requires:	%{name}-common = %{version}-%{release}
-Requires:	%{name}-tools = %{version}-%{release}
 Requires:	libpcap >= 0.4
 Suggests:	xterm
 Provides:	ethereal
@@ -98,6 +97,8 @@
 Requires:	libwiretap = %{version}-%{release}
 Provides:	ethereal-common
 Obsoletes:	ethereal-common
+Provides:	%{name}-tools
+Obsoletes:	%{name}-tools
 
 %description common
 Wireshark is the name for powerful graphical network sniffer, traffic
@@ -108,6 +109,16 @@
 the ability to view the ASCII contents of a TCP connection and plug-in
 capabilities.
 
+This package provides set of tools for manipulating capture files. 
+
+Contains:
+- capinfo - prints informatio about binary capture files,
+- dftest - shows display filter byte-code,
+- editcap - edit and/or translate the format of capture files,
+- idl2eth - corba IDL to Wireshark Plugin Generator,
+- mergecap - merges two capture files into one,
+- text2cap - generate a capture file from an ASCII hexdump of packets.
+
 %description common -l es.UTF-8
 Analizador de tráfico de red.
 
@@ -120,6 +131,18 @@
 możliwość oglądania przebiegu sesji TCP oraz możliwość dołączania
 wtyczek (plug-ins).
 
+Pakiet ten dostarcza także zestawu narzędzi do obróbki plików z
+przechwyconymi pakietami. 
+
+Zawiera:
+- capinfo - wyświetla informacje o binarnych plikach zrzutu,
+- dftest - pokazuje byte-code filtrów wyświetlania,
+- editcap - do edycji plików i tłumaczenia ich na inne formaty,
+- idl2eth - konwerter Corba IDL do pluginów Wireshark,
+- mergecap - do łączenia dwóch plików w jeden,
+- text2cap - do generowania pliku cap z szesnastkowego zrzutu ASCII
+  pakietów.
+
 %description common -l pt_BR.UTF-8
 O Wireshark é um analisador de protocolo de rede baseado no GTK+.
 
@@ -131,33 +154,6 @@
 Wireshark - це аналізатор мережевого трафіку для Unix-подібних ОС. Він
 базується на GTK+ та libpcap.
 
-%package tools
-Summary:	Tools for manipulating capture files
-Summary(pl.UTF-8):	Narzędzia do obróbki plików z przechwyconymi pakietami sieciowymi
-Group:		Networking
-Requires:	%{name}-common = %{version}-%{release}
-Provides:	ethereal-tools
-Obsoletes:	ethereal-tools
-
-%description tools
-Set of tools for manipulating capture files. Contains:
-- capinfo - prints informatio about binary capture files,
-- dftest - shows display filter byte-code,
-- editcap - edit and/or translate the format of capture files,
-- idl2eth - corba IDL to Wireshark Plugin Generator,
-- mergecap - merges two capture files into one,
-- text2cap - generate a capture file from an ASCII hexdump of packets.
-
-%description tools -l pl.UTF-8
-Zestaw narzędzi do obróbki plików z przechwyconymi pakietami. Zawiera:
-- capinfo - wyświetla informacje o binarnych plikach zrzutu,
-- dftest - pokazuje byte-code filtrów wyświetlania,
-- editcap - do edycji plików i tłumaczenia ich na inne formaty,
-- idl2eth - konwerter Corba IDL do pluginów Wireshark,
-- mergecap - do łączenia dwóch plików w jeden,
-- text2cap - do generowania pliku cap z szesnastkowego zrzutu ASCII
-  pakietów.
-
 %package -n twireshark
 Summary:	Text-mode network traffic and protocol analyzer
 Summary(pl.UTF-8):	Tekstowy analizator ruchu i protokołów sieciowych
@@ -292,12 +288,6 @@
 %files common
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog FAQ NEWS README{,.[lv]*} doc/{randpkt.txt,README.*}
-%attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.0
-%{_mandir}/man4/wireshark-filter.4*
-
-%files tools
-%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/capinfos
 %attr(755,root,root) %{_bindir}/dftest
 %attr(755,root,root) %{_bindir}/dumpcap
@@ -307,6 +297,8 @@
 %attr(755,root,root) %{_bindir}/randpkt
 %attr(755,root,root) %{_bindir}/rawshark
 %attr(755,root,root) %{_bindir}/text2pcap
+%attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.0
 %{_mandir}/man1/capinfos.1*
 %{_mandir}/man1/dumpcap.1*
 %{_mandir}/man1/editcap.1*
@@ -314,6 +306,7 @@
 %{_mandir}/man1/mergecap.1*
 %{_mandir}/man1/rawshark.1*
 %{_mandir}/man1/text2pcap.1*
+%{_mandir}/man4/wireshark-filter.4*
 
 %files -n twireshark
 %defattr(644,root,root,755)
@@ -338,6 +331,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193  2008/09/17 20:22:03  adamg
+- merge -tools into -common
+  RATIONALE: twireshark requires /usr/bin/dumpcap from wireshark-tools,
+  seems like there is no point in having both -common and -tools as they
+  are required by both wireshark and twireshark, and you can live with
+  an extra ~250 kb in a 24 MB -common package
+- release 2
+
 Revision 1.192  2008/09/08 08:34:39  blues
 - security note
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wireshark.spec?r1=1.192&r2=1.193&f=u

