rpms/wireshark/F-8 wireshark-0.99.7-pie.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 wireshark.spec, 1.23, 1.24 wireshark-0.99.5-pie.patch, 1.1, NONE
Radek Vokál (rvokal)
fedora-extras-commits at redhat.com
Wed Dec 19 08:21:42 UTC 2007
- Previous message (by thread): rpms/sear/F-8 sear-0.6.3-erisupgrade.patch, NONE, 1.1 sear-0.6.3-desktop.patch, 1.1, 1.2 sear.spec, 1.4, 1.5
- Next message (by thread): rpms/ps3pf-utils/F-8 ps3pf-utils.spec, NONE, 1.1 ps3pf_utils-2.1-rpath.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rvokal
Update of /cvs/extras/rpms/wireshark/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24260
Modified Files:
.cvsignore sources wireshark.spec
Added Files:
wireshark-0.99.7-pie.patch
Removed Files:
wireshark-0.99.5-pie.patch
Log Message:
- upgrade to 0.99.7
- switch to libsmi from net-snmp
- disable ADNS due to its lack of Ipv6 support
wireshark-0.99.7-pie.patch:
--- NEW FILE wireshark-0.99.7-pie.patch ---
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@
- at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie
@ENABLE_STATIC_TRUE at 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@
- at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie
@ENABLE_STATIC_TRUE at 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 at ./$(DEPDIR)/version_info.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at 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:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at 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 at ./$(DEPDIR)/wsp_stat.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at 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:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at 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@
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 9 Jul 2007 14:09:01 -0000 1.14
+++ .cvsignore 19 Dec 2007 08:21:03 -0000 1.15
@@ -1 +1 @@
-wireshark-0.99.6.tar.gz
+wireshark-0.99.7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 9 Jul 2007 14:09:01 -0000 1.14
+++ sources 19 Dec 2007 08:21:03 -0000 1.15
@@ -1 +1 @@
-d9c723032c424b3a210a0426167e9732 wireshark-0.99.6.tar.gz
+94fa5f58ccee12c1a298f9e0daca9a94 wireshark-0.99.7.tar.gz
Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-8/wireshark.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wireshark.spec 19 Sep 2007 07:19:32 -0000 1.23
+++ wireshark.spec 19 Dec 2007 08:21:03 -0000 1.24
@@ -1,11 +1,12 @@
%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 with_adns 0
Summary: Network traffic analyzer
Name: wireshark
-Version: 0.99.6
-Release: 3%{?dist}
+Version: 0.99.7
+Release: 1%{?dist}
License: GPL+
Group: Applications/Internet
%if %{svn_version}
@@ -16,13 +17,12 @@
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)
BuildRequires: libpcap-devel >= 0.9
-BuildRequires: net-snmp-devel >= 5.4
-BuildRequires: net-snmp-utils >= 5.4
+BuildRequires: libsmi
BuildRequires: zlib-devel, bzip2-devel
BuildRequires: openssl-devel
BuildRequires: glib2-devel, gtk2-devel
@@ -30,7 +30,10 @@
BuildRequires: python, pcre-devel, libselinux
BuildRequires: gnutls-devel
BuildRequires: desktop-file-utils, automake, libtool
-BuildRequires: htmlview, adns-devel
+BuildRequires: xdg-utils
+%if %{with_adns}
+BuildRequires: adns-devel
+%endif
Obsoletes: ethereal
Provides: ethereal
@@ -41,8 +44,11 @@
Requires: gtk2
Requires: usermode >= 1.37
Requires: wireshark = %{version}-%{release}
-Requires: net-snmp >= 5.4, net-snmp-libs >= 5.4
-Requires: htmlview, adns
+Requires: libsmi
+Requires: xdg-utils
+%if %{with_adns}
+Requires: adns
+%endif
Obsoletes: ethereal-gnome
Provides: ethereal-gnome
@@ -84,13 +90,17 @@
--bindir=%{_sbindir} \
--enable-zlib \
--enable-ipv6 \
- --with-net-snmp \
+ --with-libsmi \
--with-gnu-ld \
--disable-static \
--disable-usr-local \
--enable-gtk2 \
--with-pic \
+%if %{with_adns}
--with-adns \
+%else
+ --with-adns=no \
+%endif
--with-ssl \
--disable-warnings-as-errors \
--with-plugindir=%{_libdir}/%{name}/plugins/%{version}
@@ -186,6 +196,11 @@
%changelog
+* Tue Dec 18 2007 Radek Vokál <rvokal at redhat.com> 0.99.7-1
+- upgrade to 0.99.7
+- switch to libsmi from net-snmp
+- disable ADNS due to its lack of Ipv6 support
+
* Wed Sep 19 2007 Radek Vokál <rvokal at redhat.com> 0.99.6-3
- fixed URL
--- wireshark-0.99.5-pie.patch DELETED ---
- Previous message (by thread): rpms/sear/F-8 sear-0.6.3-erisupgrade.patch, NONE, 1.1 sear-0.6.3-desktop.patch, 1.1, 1.2 sear.spec, 1.4, 1.5
- Next message (by thread): rpms/ps3pf-utils/F-8 ps3pf-utils.spec, NONE, 1.1 ps3pf_utils-2.1-rpath.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list