rpms/kdenetwork/devel .cvsignore, 1.31, 1.32 kdenetwork.spec, 1.56, 1.57 sources, 1.35, 1.36 admin-visibility.patch, 1.3, NONE post-3.4.1-kdenetwork-libgadu.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6511

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	admin-visibility.patch post-3.4.1-kdenetwork-libgadu.patch 
Log Message:
update to 3.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	28 Jun 2005 21:19:27 -0000	1.31
+++ .cvsignore	11 Aug 2005 12:08:23 -0000	1.32
@@ -4,3 +4,4 @@
 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


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdenetwork.spec	22 Jul 2005 11:36:27 -0000	1.56
+++ kdenetwork.spec	11 Aug 2005 12:08:23 -0000	1.57
@@ -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 @@
 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 @@
 %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 @@
 %endif
 
 %changelog
+* Thu Aug 11 2005 Than Ngo <than at redhat.com> 7:3.4.2-1
+- update to 3.4.2
+
 * Fri Jul 22 2005 Than Ngo <than at redhat.com> 7:3.4.1-2
 - fix crash in kopete on x86_64
 - apply patch to fix libgadu vulnerabilities #163811, CVE CAN-2005-1852


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	28 Jun 2005 21:19:27 -0000	1.35
+++ sources	11 Aug 2005 12:08:23 -0000	1.36
@@ -1 +1 @@
-cfdec84537bd20f032b9b27c74bc28ba  kdenetwork-3.4.1.tar.bz2
+f803a0800d722983e6cc2b4c87ca435e  kdenetwork-3.4.2.tar.bz2


--- admin-visibility.patch DELETED ---


--- post-3.4.1-kdenetwork-libgadu.patch DELETED ---