rpms/kdelibs/devel .cvsignore, 1.29, 1.30 kdelibs.spec, 1.96, 1.97 sources, 1.39, 1.40 admin-visibility.patch, 1.3, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25926

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	6 Jun 2005 09:03:44 -0000	1.29
+++ .cvsignore	1 Aug 2005 13:26:50 -0000	1.30
@@ -4,3 +4,4 @@
 kdelibs-3.4.0-rc1.tar.bz2
 kdelibs-3.4.0.tar.bz2
 kdelibs-3.4.1.tar.bz2
+kdelibs-3.4.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdelibs.spec	21 Jun 2005 08:28:08 -0000	1.96
+++ kdelibs.spec	1 Aug 2005 13:26:50 -0000	1.97
@@ -8,7 +8,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.4
-%define arts_version 1.4.0
+%define arts_version 1.4.2
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@@ -21,8 +21,10 @@
 %define pie 1
 %define arts 1
 
-Version: 3.4.1
-Release: 2
+%define disable_gcc_check_and_hidden_visibility 0
+
+Version: 3.4.2
+Release: 1
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -53,7 +55,6 @@
 Patch34: kdelibs-3.4.0-qtdoc.patch
 
 # gcc4 workaround
-Patch200: admin-visibility.patch
 Patch201: kdelibs-3.4.0-gcc4-pr20973-workaround.patch
 
 %if %{arts}
@@ -172,7 +173,6 @@
 %patch32 -p1 -b .cups
 %patch33 -p1 -b .ppc
 %patch34 -p1 -b .qtdoc
-%patch200 -p1 -b .gcc4
 %patch201 -p1 -b .gcc4-pr20973
 
 # add redhat into KDE_VERSION_STRING
@@ -184,6 +184,13 @@
 export QTDOC=%{qtdocdir}
 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
@@ -385,6 +392,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Mon Aug 01 2005 Than Ngo <than redhat com> 6:3.4.2-1
+- update to 3.4.2
+
 * Tue Jun 21 2005 Than Ngo <than redhat com> 6:3.4.1-2
 - add devices protocol #160927
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	6 Jun 2005 09:03:44 -0000	1.39
+++ sources	1 Aug 2005 13:26:50 -0000	1.40
@@ -1 +1 @@
-67224e6b55856c23b0a162cab17dd1b4  kdelibs-3.4.1.tar.bz2
+fe69f2f5c66dffd8fc741dcff221b80c  kdelibs-3.4.2.tar.bz2


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