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

temporarily disable zlib until https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4955 is resolved

Browse Source 
Resolves: #643461
This commit is contained in:
Jan Safranek 2010-11-01 16:28:15 +01:00
parent 9db68dbef1
commit fd4753fd2c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wireshark.spec
View File

@ -16,7 +16,7 @@ Version: 1.4.1
%if %{svn_version} %if %{svn_version}
Release: 0.%{svn_version}%{?dist} Release: 0.%{svn_version}%{?dist}
%else %else
Release: 1%{?dist} Release: 2%{?dist}
%endif %endif
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
@ -132,8 +132,8 @@ export PIECFLAGS="-fpie"
%endif %endif
# FC5+ automatic -fstack-protector-all switch # FC5+ automatic -fstack-protector-all switch
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all} export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS" export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS" export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE"
export LDFLAGS="$LDFLAGS -pie" export LDFLAGS="$LDFLAGS -pie"
%if %{svn_version} %if %{svn_version}
./autogen.sh ./autogen.sh
@ -158,7 +158,8 @@ export LDFLAGS="$LDFLAGS -pie"
--with-ssl \ --with-ssl \
--disable-warnings-as-errors \ --disable-warnings-as-errors \
--with-python \ --with-python \
--with-plugins=%{_libdir}/%{name}/plugins/%{version} --with-plugins=%{_libdir}/%{name}/plugins/%{version} \
--with-zlib=no
#remove rpath #remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -323,6 +324,10 @@ fi
%{_sbindir}/idl2wrs %{_sbindir}/idl2wrs
%changelog %changelog
* Mon Nov 1 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.1-2
- temporarily disable zlib until
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4955 is resolved (#643461)
* Fri Oct 22 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.1-1 * Fri Oct 22 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.1-1
- upgrade to 1.4.1 - upgrade to 1.4.1
- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.1.html - see http://www.wireshark.org/docs/relnotes/wireshark-1.4.1.html