SPECS: wireshark.spec - obsoletes; adapterized

[arekm]

Author: arekm                        Date: Fri Jun  9 21:07:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- obsoletes; adapterized

---- Files affected:
SPECS:
   wireshark.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: SPECS/wireshark.spec
diff -u SPECS/wireshark.spec:1.154 SPECS/wireshark.spec:1.155
--- SPECS/wireshark.spec:1.154	Fri Jun  9 23:04:27 2006
+++ SPECS/wireshark.spec	Fri Jun  9 23:07:24 2006
@@ -5,6 +5,7 @@
 %bcond_without	krb5		# build without kerberos5 support (via heimdal)
 %bcond_without	snmp		# build without snmp support
 #
+%define	_pre	pre1
 Summary:	Network traffic and protocol analyzer
 Summary(es):	Analizador de tráfico de red
 Summary(pl):	Analizator ruchu i protokołów sieciowych
@@ -13,7 +14,6 @@
 Summary(uk):	áÎÁĚŚÚÁÔĎŇ ÍĹŇĹÖĹ×ĎÇĎ ÔŇÁĆŚËŐ
 Name:		wireshark
 Version:	0.99.1
-%define	_pre	pre1
 Release:	0.%{_pre}.1
 License:	GPL
 Group:		Networking
@@ -42,7 +42,9 @@
 BuildRequires:	zlib-devel
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	libpcap >= 0.4
+Obsoletes:	ethereal-gnome
 Obsoletes:	wireshark-gnome
+Obsoletes	ethereal
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,6 +84,7 @@
 Summary(pl):	Analizator ruchu i protokołów sieciowych - wspólne pliki
 Group:		Networking
 Requires:	libwiretap = %{version}-%{release}
+Obsoletes:	ethereal-common
 
 %description common
 Wireshark is the name for powerful graphical network sniffer, traffic
@@ -120,6 +123,7 @@
 Summary(pl):	Narzędzia do obróbki plików z przechwyconymi pakietami sieciowymi
 Group:		Networking
 Requires:	%{name}-common = %{version}-%{release}
+Obsoletes:	ethereal-tools
 
 %description tools
 Set of tools for manipulating capture files. Contains:
@@ -147,6 +151,7 @@
 Group:		Networking
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	libpcap >= 0.4
+Obsoletes:	tethereal
 
 %description -n twireshark
 Twireshark is a network protocol analyzer. It lets you capture packet
@@ -211,7 +216,7 @@
 %{__aclocal} -I ../aclocal-fallback
 %{__autoconf}
 # don't use --force here
-automake -a -c --foreign
+%{__automake}
 cd ..
 %configure \
 	--enable-randpkt \
@@ -314,6 +319,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2006/06/09 21:07:24  arekm
+- obsoletes; adapterized
+
 Revision 1.154  2006/06/09 21:04:27  arekm
 - ethereal project under new name - wireshark
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wireshark.spec?r1=1.154&r2=1.155&f=u