Author: arekm Date: Tue Jun 29 11:29:44 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.4.0 rc1 (stable 1.2 on WIRESHARK_1_2 tag)
---- Files affected:
packages/wireshark:
wireshark-ac.patch (1.2 -> 1.3) , wireshark.spec (1.226 -> 1.227) ,
wireshark-0.99.5-hip-base05.patch (1.5 -> NONE) (REMOVED),
wireshark-as_needed.patch (1.6 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/wireshark/wireshark-ac.patch
diff -u packages/wireshark/wireshark-ac.patch:1.2
packages/wireshark/wireshark-ac.patch:1.3
--- packages/wireshark/wireshark-ac.patch:1.2 Sat Apr 3 18:46:58 2010
+++ packages/wireshark/wireshark-ac.patch Tue Jun 29 13:29:38 2010
@@ -1,15 +1,26 @@
---- wireshark-1.2.7/acinclude.m4~ 2010-04-01 14:02:02.000000000 +0300
-+++ wireshark-1.2.7/acinclude.m4 2010-04-01 14:03:16.846003020 +0300
-@@ -304,7 +304,7 @@
- # work.
- #
- AC_MSG_CHECKING(for broken pcap-config)
+--- wireshark-1.4.0rc1/acinclude.m4~ 2010-06-29 13:18:13.710088062 +0200
++++ wireshark-1.4.0rc1/acinclude.m4 2010-06-29 13:19:37.996897805 +0200
+@@ -338,7 +338,7 @@
+ # work.
+ #
+ AC_MSG_CHECKING(for broken pcap-config)
- case "`\"$PCAP_CONFIG\" --libs`" in
+ case "`$PCAP_CONFIG --libs`" in
"-L "*)
#
-@@ -397,9 +397,9 @@
+@@ -361,8 +361,8 @@
+ # Found it, and it's usable; use it to get the include flags
+ # for libpcap.
+ #
+- CFLAGS="$CFLAGS `\"$PCAP_CONFIG\" --cflags`"
+- CPPFLAGS="$CPPFLAGS `\"$PCAP_CONFIG\" --cflags`"
++ CFLAGS="$CFLAGS `$PCAP_CONFIG --cflags`"
++ CPPFLAGS="$CPPFLAGS `$PCAP_CONFIG --cflags`"
+ else
+ #
+ # Didn't find it; we have to look for libpcap ourselves.
+@@ -433,9 +433,9 @@
# libraries libpcap needs.
#
if test x$enable_static = xyes; then
================================================================
Index: packages/wireshark/wireshark.spec
diff -u packages/wireshark/wireshark.spec:1.226
packages/wireshark/wireshark.spec:1.227
--- packages/wireshark/wireshark.spec:1.226 Sun Jun 13 15:23:55 2010
+++ packages/wireshark/wireshark.spec Tue Jun 29 13:29:38 2010
@@ -24,20 +24,17 @@
Summary(ru.UTF-8): Анализатор сетевого траффика
Summary(uk.UTF-8): Аналізатор мережевого трафіку
Name: wireshark
-Version: 1.2.9
-Release: 1
+Version: 1.4.0
+Release: 0.1
License: GPL
Group: Networking
-Source0: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
-# Source0-md5: a4240c36f1e668d85b703eacb7c0a95e
-Patch0: %{name}-0.99.5-hip-base05.patch
-Patch1: %{name}-as_needed.patch
-Patch2: %{name}-Werror.patch
-Patch3: %{name}-gcc43.patch
-Patch4: %{name}-ac.patch
-Patch5: %{name}-desktop.patch
+Source0:
http://www.wireshark.org/download/src/%{name}-%{version}rc1.tar.bz2
+# Source0-md5: ca5ee30ed798900142d9cd4d81637b58
+Patch0: %{name}-Werror.patch
+Patch1: %{name}-gcc43.patch
+Patch2: %{name}-ac.patch
+Patch3: %{name}-desktop.patch
URL: http://www.wireshark.org/
-BuildRequires: adns-devel
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: bison
@@ -219,14 +216,12 @@
pakietów.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}rc1
cp wireshark.desktop wireshark-kde.desktop
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
sed -i -e 's/lua5\.1/lua51/g' acinclude.m4
find -name Makefile.am | xargs sed -i -e 's/-Werror//g'
@@ -239,13 +234,13 @@
--enable-randpkt \
--enable-dftest \
--enable-threads \
+ --with-pcre \
%if %{with kerberos5}
--with-krb5 \
--with-ssl \
%endif
%{!?with_snmp:--without-net-snmp --without-ucdsnmp} \
- --with-lua=/usr \
- --with-plugindir=%{_libdir}/%{name}
+ --with-lua=/usr
%{__make}
@@ -338,6 +333,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.227 2010/06/29 11:29:38 arekm
+- up to 1.4.0 rc1 (stable 1.2 on WIRESHARK_1_2 tag)
+
Revision 1.226 2010/06/13 13:23:55 arekm
- up to 1.2.9
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wireshark/wireshark-ac.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wireshark/wireshark.spec?r1=1.226&r2=1.227&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
