rpms/kdeedu/devel .cvsignore, 1.21, 1.22 kdeedu.spec, 1.28, 1.29 sources, 1.23, 1.24 admin-visibility.patch, 1.3, NONE kdeedu-3.4.1-gcc4.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26267

Modified Files:
	.cvsignore kdeedu.spec sources 
Removed Files:
	admin-visibility.patch kdeedu-3.4.1-gcc4.patch 
Log Message:
update to 3.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	28 Jun 2005 21:11:45 -0000	1.21
+++ .cvsignore	10 Aug 2005 14:01:30 -0000	1.22
@@ -5,3 +5,4 @@
 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


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdeedu.spec	18 Jul 2005 14:48:07 -0000	1.28
+++ kdeedu.spec	10 Aug 2005 14:01:44 -0000	1.29
@@ -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 @@
 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 @@
 %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 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Aug 10 2005 Than Ngo <than at redhat.com> 3.4.2-1
+- update to 3.4.2
+
 * Mon Jul 18 2005 Than Ngo <than at redhat.com> 3.4.1-2
 - enable python-scripting #157961
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	28 Jun 2005 21:11:45 -0000	1.23
+++ sources	10 Aug 2005 14:01:44 -0000	1.24
@@ -1 +1 @@
-9fa1db1cf500c0fc594b0f5d291bbf69  kdeedu-3.4.1.tar.bz2
+e2c5cc083868dd4c35c1b50e04eb40eb  kdeedu-3.4.2.tar.bz2


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


--- kdeedu-3.4.1-gcc4.patch DELETED ---