From 5fb8a5665b9fdda88deb90efd7b887a844685948 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Aug 10 2005 14:01:44 +0000
Subject: update to 3.4.2


---

diff --git a/.cvsignore b/.cvsignore
index bcc55e7..a9582f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ kdeedu-3.3.2.tar.bz2
 kdeedu-3.4.0-rc1.tar.bz2
 kdeedu-3.4.0.tar.bz2
 kdeedu-3.4.1.tar.bz2
+kdeedu-3.4.2.tar.bz2
diff --git a/kdeedu.spec b/kdeedu.spec
index 7f4494d..bc4e3d3 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -6,9 +6,11 @@
 
 %define qt_version 3.3.4
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Name: kdeedu
-Version: 3.4.1
-Release: 2
+Version: 3.4.2
+Release: 1
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -18,8 +20,6 @@ Prefix: %{_prefix}
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
-Patch2: admin-visibility.patch
-Patch3: kdeedu-3.4.1-gcc4.patch
 
 Requires: kdebase >= 6:%{version}
 Requires: qt >= 1:%{qt_version}
@@ -108,12 +108,17 @@ Vocabulary Trainer
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
-%patch2 -p1 -b .gcc
-%patch3 -p1 -b .gcc4
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%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
@@ -166,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 10 2005 Than Ngo <than@redhat.com> 3.4.2-1
+- update to 3.4.2
+
 * Mon Jul 18 2005 Than Ngo <than@redhat.com> 3.4.1-2
 - enable python-scripting #157961
 
diff --git a/sources b/sources
index a1deb0d..8abfaab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fa1db1cf500c0fc594b0f5d291bbf69  kdeedu-3.4.1.tar.bz2
+e2c5cc083868dd4c35c1b50e04eb40eb  kdeedu-3.4.2.tar.bz2