- ethereal project under new name - wireshark

Changed files:
    wireshark.spec -> 1.154

diff --git a/wireshark.spec b/wireshark.spec
index 46dde487f1a60b502eb77cc6251320a0ed850080..06e9ec88b65099f883ba5f077e457fccbf79a587 100644 (file)
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    gtk1            # build gtk+1 (not gtk+2) based ethereal binary
+%bcond_with    gtk1            # build gtk+1 (not gtk+2) based wireshark binary
 %bcond_without krb5            # build without kerberos5 support (via heimdal)
 %bcond_without snmp            # build without snmp support
 #
@@ -10,16 +10,17 @@ Summary(pl):        Analizator ruchu i protoko
 Summary(pt_BR):        Analisador de tráfego de rede
 Summary(ru):   áÎÁÌÉÚÁÔÏÒ ÓÅÔÅ×ÏÇÏ ÔÒÁÆÆÉËÁ
 Summary(uk):   áÎÁ̦ÚÁÔÏÒ ÍÅÒÅÖÅ×ÏÇÏ ÔÒÁƦËÕ
-Name:          ethereal
-Version:       0.99.0
-Release:       1
+Name:          wireshark
+Version:       0.99.1
+%define        _pre    pre1
+Release:       0.%{_pre}.1
 License:       GPL
 Group:         Networking
-Source0:       http://dl.sourceforge.net/ethereal/%{name}-%{version}.tar.bz2
-# Source0-md5: f9905b9d347acdc05af664a7553f7f76
+Source0:       http://www.wireshark.org/download/prerelease/%{name}-%{version}%{_pre}.tar.gz
+# Source0-md5: 3f3bfed8727cb24d41fd4f10f7b91d9f
 Source1:       %{name}.desktop
 Source2:       %{name}.su-start-script
-URL:           http://www.ethereal.com/
+URL:           http://www.wireshark.org/
 BuildRequires: adns-devel
 BuildRequires: autoconf
 BuildRequires: automake
@@ -40,14 +41,14 @@ BuildRequires:      pkgconfig
 BuildRequires: zlib-devel
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      libpcap >= 0.4
-Obsoletes:     ethereal-gnome
+Obsoletes:     wireshark-gnome
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Ethereal is the name for powerful graphical network sniffer, traffic
+Wireshark is the name for powerful graphical network sniffer, traffic
 and protocol analyzer based on GTK+ and libpcap libraries. It lets you
 capture and interactively browse the contents of network frames with
-vast knowledge of more than 100 network protocols. Ethereal has
+vast knowledge of more than 100 network protocols. Wireshark has
 severeal useful features, including a rich display filter language,
 the ability to view the ASCII contents of a TCP connection and plug-in
 capabilities.
@@ -56,23 +57,23 @@ capabilities.
 Analizador de tráfico de red.
 
 %description -l pl
-Ethereal jest potê¿nym, graficznym snifferem, analizatorem ruchu oraz
+Wireshark jest potê¿nym, graficznym snifferem, analizatorem ruchu oraz
 protoko³ów sieciowych opartym na bibliotekach GTK+ oraz libpcap.
 Umo¿liwia on przechwytywanie oraz interaktywn± analizê zawarto¶ci
-ramek oraz ponad stu protoko³ów sieciowych. Ethereal posiada wiele
+ramek oraz ponad stu protoko³ów sieciowych. Wireshark posiada wiele
 u¿ytecznych cech, takich jak rozbudowany jêzyk filtrów wy¶wietlania,
 mo¿liwo¶æ ogl±dania przebiegu sesji TCP oraz mo¿liwo¶æ do³±czania
 wtyczek (plug-ins).
 
 %description -l pt_BR
-O Ethereal é um analisador de protocolo de rede baseado no GTK+.
+O Wireshark é um analisador de protocolo de rede baseado no GTK+.
 
 %description -l ru
-Ethereal - ÜÔÏ ÁÎÁÌÉÚÁÔÏÒ ÓÅÔÅ×ÏÇÏ ÔÒÁÆÆÉËÁ ÄÌÑ Unix-ÐÏÄÏÂÎÙÈ ïó. ïÎ
+Wireshark - ÜÔÏ ÁÎÁÌÉÚÁÔÏÒ ÓÅÔÅ×ÏÇÏ ÔÒÁÆÆÉËÁ ÄÌÑ Unix-ÐÏÄÏÂÎÙÈ ïó. ïÎ
 ÂÁÚÉÒÕÅÔÓÑ ÎÁ GTK+ É libpcap.
 
 %description -l uk
-Ethereal - ÃÅ ÁÎÁ̦ÚÁÔÏÒ ÍÅÒÅÖÅ×ÏÇÏ ÔÒÁƦËÕ ÄÌÑ Unix-ÐÏĦÂÎÉÈ ïó. ÷¦Î
+Wireshark - ÃÅ ÁÎÁ̦ÚÁÔÏÒ ÍÅÒÅÖÅ×ÏÇÏ ÔÒÁƦËÕ ÄÌÑ Unix-ÐÏĦÂÎÉÈ ïó. ÷¦Î
 ÂÁÚÕ¤ÔØÓÑ ÎÁ GTK+ ÔÁ libpcap.
 
 %package common
@@ -82,10 +83,10 @@ Group:              Networking
 Requires:      libwiretap = %{version}-%{release}
 
 %description common
-Ethereal is the name for powerful graphical network sniffer, traffic
+Wireshark is the name for powerful graphical network sniffer, traffic
 and protocol analyzer based on GTK+ and libpcap libraries. It lets you
 capture and interactively browse the contents of network frames with
-vast knowledge of more than 100 network protocols. Ethereal has
+vast knowledge of more than 100 network protocols. Wireshark has
 severeal useful features, including a rich display filter language,
 the ability to view the ASCII contents of a TCP connection and plug-in
 capabilities.
@@ -94,23 +95,23 @@ capabilities.
 Analizador de tráfico de red.
 
 %description common -l pl
-Ethereal jest potê¿nym, graficznym snifferem, analizatorem ruchu oraz
+Wireshark jest potê¿nym, graficznym snifferem, analizatorem ruchu oraz
 protoko³ów sieciowych opartym na bibliotekach GTK+ oraz libpcap.
 Umo¿liwia on przechwytywanie oraz interaktywn± analizê zawarto¶ci
-ramek oraz ponad stu protoko³ów sieciowych. Ethereal posiada wiele
+ramek oraz ponad stu protoko³ów sieciowych. Wireshark posiada wiele
 u¿ytecznych cech, takich jak rozbudowany jêzyk filtrów wy¶wietlania,
 mo¿liwo¶æ ogl±dania przebiegu sesji TCP oraz mo¿liwo¶æ do³±czania
 wtyczek (plug-ins).
 
 %description common -l pt_BR
-O Ethereal é um analisador de protocolo de rede baseado no GTK+.
+O Wireshark é um analisador de protocolo de rede baseado no GTK+.
 
 %description common -l ru
-Ethereal - ÜÔÏ ÁÎÁÌÉÚÁÔÏÒ ÓÅÔÅ×ÏÇÏ ÔÒÁÆÆÉËÁ ÄÌÑ Unix-ÐÏÄÏÂÎÙÈ ïó. ïÎ
+Wireshark - ÜÔÏ ÁÎÁÌÉÚÁÔÏÒ ÓÅÔÅ×ÏÇÏ ÔÒÁÆÆÉËÁ ÄÌÑ Unix-ÐÏÄÏÂÎÙÈ ïó. ïÎ
 ÂÁÚÉÒÕÅÔÓÑ ÎÁ GTK+ É libpcap.
 
 %description common -l uk
-Ethereal - ÃÅ ÁÎÁ̦ÚÁÔÏÒ ÍÅÒÅÖÅ×ÏÇÏ ÔÒÁƦËÕ ÄÌÑ Unix-ÐÏĦÂÎÉÈ ïó. ÷¦Î
+Wireshark - ÃÅ ÁÎÁ̦ÚÁÔÏÒ ÍÅÒÅÖÅ×ÏÇÏ ÔÒÁƦËÕ ÄÌÑ Unix-ÐÏĦÂÎÉÈ ïó. ÷¦Î
 ÂÁÚÕ¤ÔØÓÑ ÎÁ GTK+ ÔÁ libpcap.
 
 %package tools
@@ -124,7 +125,7 @@ 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 Ethereal Plugin Generator,
+- 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.
 
@@ -133,12 +134,12 @@ Zestaw narz
 - 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 Ethereal,
+- 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 tethereal
+%package -n twireshark
 Summary:       Text-mode network traffic and protocol analyzer
 Summary(pl):   Tekstowy analizator ruchu i protoko³ów sieciowych
 Summary(pt_BR):        Analisador modo texto de tráfego de rede (sniffer)
@@ -146,25 +147,25 @@ Group:            Networking
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      libpcap >= 0.4
 
-%description -n tethereal
-Tethereal is a network protocol analyzer. It lets you capture packet
+%description -n twireshark
+Twireshark is a network protocol analyzer. It lets you capture packet
 data from a live network, or read packets from a previously saved
 capture file, either printing a decoded form of those packets to the
-standard output or writing the packets to a file. Tethereal's native
+standard output or writing the packets to a file. Twireshark's native
 capture file format is libpcap format, which is also the format used
 by tcpdump and various other tools.
 
-%description -n tethereal -l pl
-Tethereal jest analizatorem protoko³ów sieciowych. Pozwala na
+%description -n twireshark -l pl
+Twireshark jest analizatorem protoko³ów sieciowych. Pozwala na
 przechwytywanie pakietów z sieci lub wczytywanie danych z pliku.
-Zdekodowany wynik (a tethereal zna ponad 100 rozmaitych protoko³ów
+Zdekodowany wynik (a twireshark zna ponad 100 rozmaitych protoko³ów
 sieciowych!) jest wy¶wietlony na ekranie. Natywnym formatem plików
 tetherala jest format libpcap, tak wiêc jest on kompatybilny z
 tcpdumpem i innymi podobnymi narzêdziami.
 
-%description -n tethereal -l pt_BR
+%description -n twireshark -l pt_BR
 Esta é uma versão para modo texto do analisador de tráfego de rede
-Ethereal.
+Wireshark.
 
 %package -n libwiretap
 Summary:       Packet capture and analysis library
@@ -198,7 +199,7 @@ Pliki nag
 pakietów.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_pre}
 
 %build
 %{__libtoolize}
@@ -234,16 +235,16 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_includedir}/wiretap}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}_su
-install image/ethereal48x48-trans.png \
+install image/hi48-app-wireshark.png \
        $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 install 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
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/%{version}*/*.la
 
 # no headers installed for this library
-rm -f $RPM_BUILD_ROOT%{_libdir}/libethereal.{so,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libwireshark.{so,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,22 +257,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ethereal
+%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
+%dir %{_libdir}/%{name}/plugins/%{version}*
+%attr(755,root,root) %{_libdir}/%{name}/plugins/%{version}*/*.so
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
-%{_mandir}/man1/ethereal.1*
+%{_mandir}/man1/wireshark.1*
 
 %files common
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog FAQ NEWS README{,.[lv]*} doc/{randpkt.txt,README.*}
-%attr(755,root,root) %{_libdir}/libethereal.so.*.*.*
-%{_mandir}/man4/ethereal-filter.4*
+%attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
+%{_mandir}/man4/wireshark-filter.4*
 
 %files tools
 %defattr(644,root,root,755)
@@ -279,21 +280,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dftest
 %attr(755,root,root) %{_bindir}/dumpcap
 %attr(755,root,root) %{_bindir}/editcap
-%attr(755,root,root) %{_bindir}/idl2eth
+%attr(755,root,root) %{_bindir}/idl2wrs
 %attr(755,root,root) %{_bindir}/mergecap
 %attr(755,root,root) %{_bindir}/text2pcap
 %attr(755,root,root) %{_bindir}/randpkt
 %{_mandir}/man1/capinfo*
 %{_mandir}/man1/dumpcap*
 %{_mandir}/man1/editcap*
-%{_mandir}/man1/idl2eth*
+%{_mandir}/man1/idl2wrs*
 %{_mandir}/man1/mergecap*
 %{_mandir}/man1/text2pcap*
 
-%files -n tethereal
+%files -n twireshark
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/tethereal
-%{_mandir}/man1/tethereal*
+%attr(755,root,root) %{_bindir}/tshark
+%{_mandir}/man1/tshark*
 
 %files -n libwiretap
 %defattr(644,root,root,755)