diff --git a/.cvsignore b/.cvsignore index 4827eb2..9aa2b00 100644 --- a/.cvsignore +++ b/.cvsignore @@ -4,3 +4,4 @@ kdenetwork-3.3.2.tar.bz2 kdenetwork-3.4.0-rc1.tar.bz2 kdenetwork-3.4.0.tar.bz2 kdenetwork-3.4.1.tar.bz2 +kdenetwork-3.4.2.tar.bz2 diff --git a/kdenetwork.spec b/kdenetwork.spec index 74b9c4a..8c54f89 100644 --- a/kdenetwork.spec +++ b/kdenetwork.spec @@ -7,9 +7,11 @@ %define qt_version 1:3.3.4 +%define disable_gcc_check_and_hidden_visibility 1 + Name: kdenetwork -Version: 3.4.1 -Release: 2 +Version: 3.4.2 +Release: 1 Summary: K Desktop Environment - Network Applications Epoch: 7 Group: Applications/Internet @@ -28,13 +30,9 @@ Patch2: kde-libtool.patch Patch3: kdenetwork-3.3.92-kppp.patch Patch4: kdenetwork-3.2.3-resolv.patch Patch5: kdenetwork-3.3.0-ksirc.patch -Patch6: admin-visibility.patch Patch7: kdenetwork-3.4.0-xmms.patch Patch8: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch -# CVE CAN-2005-1852, libgadu vulnerabilities -Patch100: post-3.4.1-kdenetwork-libgadu.patch - Requires: kdelibs >= 6:%{version} Requires: kdebase >= 6:%{version} Prereq: /sbin/chkconfig @@ -86,15 +84,20 @@ Xmms plugin for Kopete %patch3 -p1 -b .kppp %patch4 -p1 -b .ppp %patch5 -p1 -b .ksirc -%patch6 -p1 -b .gcc %if !%{xmms} %patch7 -p1 -b .xmms %endif %patch8 -p1 -b .libgadu-va_copy -%patch100 -p0 -b .CAN-2005-1852 find -name CVS | xargs rm -rf +%if %{disable_gcc_check_and_hidden_visibility} + # disable gcc check + perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in + # disable hidden visibility + perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in +%endif + %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -231,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Aug 11 2005 Than Ngo 7:3.4.2-1 +- update to 3.4.2 + * Fri Jul 22 2005 Than Ngo 7:3.4.1-2 - fix crash in kopete on x86_64 - apply patch to fix libgadu vulnerabilities #163811, CVE CAN-2005-1852 diff --git a/sources b/sources index 0fc73fc..beda54f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 +f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2