rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

remove SVN checkout support, I prefer to release stable sw. And get rid of dependency on libtool as side effect.

Browse Source
This commit is contained in:
Jan Safranek 2010-12-06 15:22:43 +01:00
parent 42b94425aa
commit 2c07b0aac8
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wireshark.spec
View File

@ -1,7 +1,5 @@
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
#define to 0 for final version
%define svn_version 0
%define with_adns 0 %define with_adns 0
%define with_lua 1 %define with_lua 1
%if 0%{?rhel} != 0 %if 0%{?rhel} != 0
@ -13,19 +11,10 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.4.2 Version: 1.4.2
%if %{svn_version}
Release: 0.%{svn_version}%{?dist}
%else
Release: 3%{?dist} Release: 3%{?dist}
%endif
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
%if %{svn_version}
# svn export http://anonsvn.wireshark.org/wireshark/trunk wireshark-%{version}-SVN-%{svn_version}
Source0: http://www.wireshark.org/download/automated/src/wireshark-%{version}-SVN-%{svn_version}.tar.bz2
%else
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
%endif
Source1: wireshark.pam Source1: wireshark.pam
Source2: wireshark.console Source2: wireshark.console
Source3: wireshark.desktop Source3: wireshark.desktop
@ -52,7 +41,7 @@ BuildRequires: glib2-devel, gtk2-devel
BuildRequires: elfutils-devel, krb5-devel BuildRequires: elfutils-devel, krb5-devel
BuildRequires: python, pcre-devel, libselinux BuildRequires: python, pcre-devel, libselinux
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: desktop-file-utils, automake, libtool BuildRequires: desktop-file-utils
BuildRequires: xdg-utils BuildRequires: xdg-utils
BuildRequires: flex, bison, python BuildRequires: flex, bison, python
BuildRequires: GeoIP-devel BuildRequires: GeoIP-devel
@ -105,11 +94,7 @@ and plugins.
%prep %prep
%if %{svn_version}
%setup -q -n %{name}-%{version}-SVN-%{svn_version}
%else
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%endif
%patch1 -p1 %patch1 -p1
%if %{with_lua} %if %{with_lua}
@ -131,9 +116,6 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE" export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE" export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
export LDFLAGS="$LDFLAGS -pie" export LDFLAGS="$LDFLAGS -pie"
%if %{svn_version}
./autogen.sh
%endif
%configure \ %configure \
--bindir=%{_sbindir} \ --bindir=%{_sbindir} \