From 03c49c55b3f08d415c39c6eb8b61597dca6b2e522c825a5245f24de17b5a2804 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 7 Mar 2007 21:51:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=4

---
 wireshark.changes |  6 +++++
 wireshark.spec    | 67 ++++++++++++++++++++++-------------------------
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/wireshark.changes b/wireshark.changes
index bb05e0b..d62fe3b 100644
--- a/wireshark.changes
+++ b/wireshark.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  7 13:48:57 CET 2007 - prusnak@suse.cz
+
+- added [t]ethereal symlinks [#252117]
+- cleaned spec file
+
 -------------------------------------------------------------------
 Wed Feb  7 10:56:50 CET 2007 - prusnak@suse.cz
 
diff --git a/wireshark.spec b/wireshark.spec
index 11afce9..fe43dac 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -17,7 +17,7 @@ Group:          Productivity/Networking/Diagnostic
 Autoreqprov:    on
 Summary:        A Network Traffic Analyser
 Version:        0.99.5
-Release:        2
+Release:        7
 URL:            http://www.wireshark.org/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
@@ -120,41 +120,35 @@ cd wiretap
 autoreconf -fi
 cd ..
 autoreconf -fi
-CFLAGS="$RPM_OPT_FLAGS -fstack-protector" ./configure \
-            --prefix=%{_prefix} \
-            --sysconfdir=%{_sysconfdir} \
-            --mandir=%{_mandir} \
-            --libdir=%{_libdir} \
-            --enable-gtk2 \
-            --enable-ipv6 \
-	    --with-pcap \
-	    --with-zlib \
-	    --with-pcre \
-            --with-ssl \
-	    --with-net-snmp \
-            --with-krb5 \
-	    --with-adns
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
+%configure \
+    --enable-gtk2 \
+    --enable-ipv6 \
+    --with-pcap \
+    --with-zlib \
+    --with-pcre \
+    --with-ssl \
+    --with-net-snmp \
+    --with-krb5 \
+    --with-adns
 make %{?jobs:-j%jobs}
 
 %install
 make "DESTDIR=$RPM_BUILD_ROOT" install
-install -d -m 755 $RPM_BUILD_ROOT/etc
+ln -fs wireshark $RPM_BUILD_ROOT%{_bindir}/ethereal
+ln -fs tshark $RPM_BUILD_ROOT%{_bindir}/tethereal
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 644 *.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-%if %suse_version > 899
-  %suse_update_desktop_file -i wireshark System Network 
-%else
-  mkdir -p $RPM_BUILD_ROOT/usr/share/applications/
-  install -m 644 Wireshark.desktop $RPM_BUILD_ROOT/usr/share/applications/
-%endif
+%suse_update_desktop_file -i wireshark System Network 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
-install -d -m 755  $RPM_BUILD_ROOT/usr/include/wireshark
+install -d -m 755  $RPM_BUILD_ROOT%{_includedir}/wireshark
 for i in `cat %{S:3}`; do
-  install -m 644 $i $RPM_BUILD_ROOT/usr/include/wireshark
+  install -m 644 $i $RPM_BUILD_ROOT%{_includedir}/wireshark
 done
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post
 %run_ldconfig
@@ -167,22 +161,25 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING NEWS README*  
 %{_mandir}/man1/[^i]*
 %{_mandir}/man4/*
-/usr/share/applications/*.desktop
-/usr/share/pixmaps/wireshark.png
-/usr/bin/[^i]*
-/usr/%{_lib}/lib*.so.*
-/usr/%{_lib}/wireshark
-/usr/share/wireshark
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/wireshark.png
+%{_bindir}/[^i]*
+%{_libdir}/lib*.so.*
+%{_libdir}/wireshark
+%{_datadir}/wireshark
 
 %files devel
 %defattr(-,root,root)
 %doc doc/README.*
-%{_prefix}/include/wireshark
-/usr/%{_lib}/*.so
-/usr/bin/idl2wrs
+%{_includedir}/wireshark
+%{_libdir}/*.so
+%{_bindir}/idl2wrs
 %{_mandir}/man1/idl2wrs*
 
-%changelog -n wireshark
+%changelog
+* Wed Mar 07 2007 - prusnak@suse.cz
+- added [t]ethereal symlinks [#252117]
+- cleaned spec file
 * Wed Feb 07 2007 - prusnak@suse.cz
 - fix SSL support [#242738]
 - fix build warnings in dissector's code (dissectors.patch)