rpms/ettercap/FC-5 ettercap-README.fedora, 1.1, 1.2 ettercap.spec, 1.5, 1.6

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/extras/rpms/ettercap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15244

Modified Files:
	ettercap-README.fedora ettercap.spec 
Log Message:
Alternatives fix.



Index: ettercap-README.fedora
===================================================================
RCS file: /cvs/extras/rpms/ettercap/FC-5/ettercap-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ettercap-README.fedora	19 Mar 2007 15:34:13 -0000	1.1
+++ ettercap-README.fedora	23 Mar 2007 13:21:01 -0000	1.2
@@ -12,4 +12,6 @@
 ettercap-text and ettercap-curses.
 
 "alternatives --config ettercap" allows switching between default tui and
-default gui if both packages are installed.
\ No newline at end of file
+default gui if both packages are installed.
+
+If upgrading from 0.7.3-13.1 or earlier, please run "rpm -e ettercap ettercap-gtk --noscripts" prior to upgrading.


Index: ettercap.spec
===================================================================
RCS file: /cvs/extras/rpms/ettercap/FC-5/ettercap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ettercap.spec	19 Mar 2007 16:45:24 -0000	1.5
+++ ettercap.spec	23 Mar 2007 13:21:01 -0000	1.6
@@ -1,6 +1,6 @@
 Name: ettercap
 Version: 0.7.3
-Release: 13.3%{?dist}
+Release: 14%{?dist}
 Summary: Network traffic sniffer/analyser, NCURSES interface version
 Group: Applications/Internet
 License: GPL        
@@ -11,14 +11,21 @@
 Patch0: ettercap-NG-0.7.3-UI.patch
 BuildRoot: %{_tmppath}/%{name}-NG-%{version}-%{release}-root%(%{__id_u} -n)
 
-BuildRequires: libpcap
 BuildRequires: libnet-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
+
+%if "0%{?dist}" == "0fc5"
+BuildRequires: libpcap
+%elif "0%{?dist}" == "0el4"
+BuildRequires: libpcap
+%else
+BuildRequires: libpcap-devel
 BuildRequires: libtool-ltdl-devel
+%endif
 
 Requires: ettercap-common = %{version}-%{release}
 Requires(post): %{_sbindir}/alternatives
@@ -111,16 +118,13 @@
   %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 
 %post
-%{_sbindir}/alternatives --install  %{_bindir}/ettercap ettercap \
-%{_bindir}/ettercap-tui 30 --slave %{_bindir}/ettercap ettercap \
-%{_bindir}/ettercap-text 40 --slave  %{_bindir}/ettercap ettercap \
-%{_bindir}/ettercap-curses 50
+%{_sbindir}/alternatives --install  %{_bindir}/ettercap ettercap %{_bindir}/ettercap-tui 30 \
+            --slave /usr/bin/ettercap-text ettercap-text /usr/bin/ettercap-tui \
+            --slave  /usr/bin/ettercap-curses ettercap-curses /usr/bin/ettercap-tui
 
 %preun
 if [ "$1" = 0 ]; then
     %{_sbindir}/alternatives --remove ettercap %{_bindir}/ettercap-tui
-    %{_sbindir}/alternatives --remove ettercap %{_bindir}/ettercap-text
-    %{_sbindir}/alternatives --remove ettercap %{_bindir}/ettercap-curses
 fi
 
 %post gtk
@@ -129,8 +133,10 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%{_sbindir}/alternatives --install  %{_bindir}/ettercap ettercap \
-%{_bindir}/ettercap-gtk 30
+%{_sbindir}/alternatives --install  %{_bindir}/ettercap ettercap %{_bindir}/ettercap-gtk 40 \
+            --slave /usr/bin/ettercap-text ettercap-text /usr/bin/ettercap-gtk \
+            --slave  /usr/bin/ettercap-curses ettercap-curses /usr/bin/ettercap-gtk
+
 
 %preun gtk
 if [ "$1" = 0 ]; then
@@ -176,14 +182,10 @@
 %{_libdir}/ettercap
 
 %changelog
-* Mon Mar 19 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-13.3
-- BR fix for FC5.
-* Mon Mar 19 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-13.2
-- BR fix for FC5.
-* Mon Mar 19 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-13.1
-- BR fix for FC5.
-* Fri Mar 16 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-13
-- Added -text -curses symlinks
+* Fri Mar 23 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-14
+- Alternatives fix by Manuel Wolfshant.
+- Please run rpm -e ettercap ettercap-gtk --noscripts before upgrading.
+- Bump to unified FC5 compat.
 * Thu Mar 15 2007 Jon Ciesla <limb at jcomserv.net> - 0.7.3-12
 - Added ettercap-README.fedora
 - Fixed Requires versioning.