rpms/kdebase/devel .cvsignore, 1.38, 1.39 kdebase-3.4.1-redhat.patch, 1.1, 1.2 kdebase.spec, 1.116, 1.117 sources, 1.57, 1.58 kdebase-3.4.1-buffer.patch, 1.1, NONE kdebase-3.4.1-gcc4.patch, 1.2, NONE kdebase-3.4.1-misc.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14493

Modified Files:
	.cvsignore kdebase-3.4.1-redhat.patch kdebase.spec sources 
Removed Files:
	kdebase-3.4.1-buffer.patch kdebase-3.4.1-gcc4.patch 
	kdebase-3.4.1-misc.patch 
Log Message:
3.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	6 Jun 2005 14:08:20 -0000	1.38
+++ .cvsignore	1 Aug 2005 16:28:12 -0000	1.39
@@ -12,3 +12,4 @@
 kde-redhat-config-3.2.0-0.8.tar.bz2
 kde-redhat-config-3.2.0-0.9.tar.bz2
 kdebase-3.4.1.tar.bz2
+kdebase-3.4.2.tar.bz2

kdebase-3.4.1-redhat.patch:
 kdebase-3.2.0/kde.pamd |   14 +++++++-----
 kdebase-3.4.0/startkde |   56 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 9 deletions(-)

Index: kdebase-3.4.1-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.4.1-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.4.1-redhat.patch	6 Jun 2005 14:08:20 -0000	1.1
+++ kdebase-3.4.1-redhat.patch	1 Aug 2005 16:28:12 -0000	1.2
@@ -21,7 +21,7 @@
 @@ -1,8 +1,56 @@
  #!/bin/sh
  #
- #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.4.1 )
+ #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.4.2 )
 +#  Modified for Red Hat Linux
  #
  


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kdebase.spec	4 Jul 2005 09:46:12 -0000	1.116
+++ kdebase.spec	1 Aug 2005 16:28:12 -0000	1.117
@@ -11,16 +11,18 @@
 %define gdmsession KDE
 
 %define qt_version 3.3.4
-%define arts_version 1.4.1
-%define kde_version 3.4.1
+%define arts_version 1.4.2
+%define kde_version 3.4.2
 
 %define make_cvs 1
 %define arts 1
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.4.1
-Release: 4
+Version: 3.4.2
+Release: 1
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -60,12 +62,6 @@
 Patch91: kdebase-3.4.0-kdesktop-konsole.patch
 Patch92: kdebase-3.4.0-xdg.patch
 Patch93: kdebase-3.4.1-pam.patch
-Patch94: kdebase-3.4.1-gcc4.patch
-Patch95: kdebase-3.4.1-buffer.patch
-Patch96: kdebase-3.4.1-misc.patch
-
-# gcc 4 workaround
-patch200: admin-visibility.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
@@ -154,12 +150,6 @@
 %patch91 -p1 -b .kdestop-konsole
 %patch92 -p1 -b .xdg
 %patch93 -p1 -b .loginuid
-%patch94 -p1 -b .gcc4
-%patch95 -p1 -b .buffer
-%patch96 -p1 -b .misc
-
-# gcc 4 workaround
-%patch200 -p1 -b .gcc4
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -190,6 +180,13 @@
 fi
 %endif
 
+%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
@@ -442,6 +439,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Mon Aug 01 2005 Than Ngo <than redhat com> 3.4.2-1
+- update to 3.4.2
+
 * Mon Jul 04 2005 Than Ngo <than redhat com> 3.4.1-4
 - fix uninitialized variable warning #16231
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	6 Jun 2005 14:08:20 -0000	1.57
+++ sources	1 Aug 2005 16:28:12 -0000	1.58
@@ -1,2 +1,2 @@
 776b3f900740f021b4df3871e596aa6f  kde-redhat-config-3.2.0-0.9.tar.bz2
-8fbe0b943721b79f2549064b580acdde  kdebase-3.4.1.tar.bz2
+0ea16eb7185ef014d8bd4da4f4530272  kdebase-3.4.2.tar.bz2


--- kdebase-3.4.1-buffer.patch DELETED ---


--- kdebase-3.4.1-gcc4.patch DELETED ---


--- kdebase-3.4.1-misc.patch DELETED ---