From e301ecb6a6b31b7ab47e56b800b2c0536e504a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Vok=C3=A1l?= Date: Tue, 20 Nov 2007 20:31:52 +0000 Subject: [PATCH] upgrade tp 0.99.7 pre-release --- .cvsignore | 2 +- sources | 2 +- wireshark-0.99.5-pie.patch | 56 ------------------------------------ wireshark-0.99.7-pie.patch | 58 ++++++++++++++++++++++++++++++++++++++ wireshark.spec | 13 +++++---- 5 files changed, 68 insertions(+), 63 deletions(-) delete mode 100644 wireshark-0.99.5-pie.patch create mode 100644 wireshark-0.99.7-pie.patch diff --git a/.cvsignore b/.cvsignore index 0714931..9a6ea4d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wireshark-0.99.6.tar.gz +wireshark-0.99.7-SVN-23507.tar.gz diff --git a/sources b/sources index 4e1557e..8dd094b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9c723032c424b3a210a0426167e9732 wireshark-0.99.6.tar.gz +ebfc388ed12c22faf000999c587e8baf wireshark-0.99.7-SVN-23507.tar.gz diff --git a/wireshark-0.99.5-pie.patch b/wireshark-0.99.5-pie.patch deleted file mode 100644 index d89f1ea..0000000 --- a/wireshark-0.99.5-pie.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- wireshark-0.99.5-SVN-20402/Makefile.in.pie 2007-01-12 05:39:22.000000000 +0100 -+++ wireshark-0.99.5-SVN-20402/Makefile.in 2007-01-15 10:25:54.000000000 +0100 -@@ -910,7 +910,7 @@ - wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \ - @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@ - --@ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -+@ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie - @ENABLE_STATIC_TRUE@wireshark_LDFLAGS = -Wl,-static -all-static - - # Libraries and plugin flags with which to link wireshark. -@@ -935,7 +935,7 @@ - @LIBGNUTLS_LIBS@ \ - @PORTAUDIO_LIBS@ - --@ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -+@ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie - @ENABLE_STATIC_TRUE@tshark_LDFLAGS = -Wl,-static -all-static - - # Libraries and plugin flags with which to link tshark. -@@ -1489,14 +1489,14 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version_info.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+@am__fastdepCC_TRUE@ if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ---- wireshark-0.99.5-SVN-20402/gtk/Makefile.in.pie 2007-01-12 05:39:09.000000000 +0100 -+++ wireshark-0.99.5-SVN-20402/gtk/Makefile.in 2007-01-15 10:22:01.000000000 +0100 -@@ -961,14 +961,14 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wsp_stat.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+@am__fastdepCC_TRUE@ if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ diff --git a/wireshark-0.99.7-pie.patch b/wireshark-0.99.7-pie.patch new file mode 100644 index 0000000..2111bec --- /dev/null +++ b/wireshark-0.99.7-pie.patch @@ -0,0 +1,58 @@ +diff -up wireshark-0.99.7-SVN-23507/Makefile.in.pie wireshark-0.99.7-SVN-23507/Makefile.in +--- wireshark-0.99.7-SVN-23507/Makefile.in.pie 2007-11-20 05:34:36.000000000 -0500 ++++ wireshark-0.99.7-SVN-23507/Makefile.in 2007-11-20 15:00:25.000000000 -0500 +@@ -1004,7 +1004,7 @@ noinst_HEADERS = \ + wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \ + @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@ + +-@ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic ++@ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie + @ENABLE_STATIC_TRUE@wireshark_LDFLAGS = -Wl,-static -all-static + + # Libraries and plugin flags with which to link wireshark. +@@ -1030,7 +1030,7 @@ wireshark_LDADD = \ + @LIBGNUTLS_LIBS@ \ + @PORTAUDIO_LIBS@ + +-@ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic ++@ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie + @ENABLE_STATIC_TRUE@tshark_LDFLAGS = -Wl,-static -all-static + + # Libraries and plugin flags with which to link tshark. +@@ -1610,14 +1610,14 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version_info.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +diff -up wireshark-0.99.7-SVN-23507/gtk/Makefile.in.pie wireshark-0.99.7-SVN-23507/gtk/Makefile.in +--- wireshark-0.99.7-SVN-23507/gtk/Makefile.in.pie 2007-11-20 05:34:33.000000000 -0500 ++++ wireshark-0.99.7-SVN-23507/gtk/Makefile.in 2007-11-20 15:01:33.000000000 -0500 +@@ -979,14 +979,14 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wsp_stat.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ diff --git a/wireshark.spec b/wireshark.spec index 310010a..dd2c549 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,11 +1,11 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") #define to 0 for final version -%define svn_version 0 +%define svn_version 23507 Summary: Network traffic analyzer Name: wireshark -Version: 0.99.6 -Release: 3%{?dist} +Version: 0.99.7 +Release: 0.pre1%{?dist} License: GPL+ Group: Applications/Internet %if %{svn_version} @@ -16,7 +16,7 @@ Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.gz Source1: wireshark.pam Source2: wireshark.console Source3: wireshark.desktop -Patch1: wireshark-0.99.5-pie.patch +Patch1: wireshark-0.99.7-pie.patch Patch3: wireshark-nfsv4-opts.patch Url: http://www.wireshark.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +42,7 @@ Requires: gtk2 Requires: usermode >= 1.37 Requires: wireshark = %{version}-%{release} Requires: net-snmp >= 5.4, net-snmp-libs >= 5.4 -Requires: htmlview, adns +Requires: xdg-utils, adns Obsoletes: ethereal-gnome Provides: ethereal-gnome @@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 20 2007 Radek Vokal 0.99.7-0.pre1 +- upgrade to 0.99.7 pre-release + * Wed Sep 19 2007 Radek Vokál 0.99.6-3 - fixed URL