rpms/kdeaddons/devel .cvsignore, 1.24, 1.25 kdeaddons.spec, 1.35, 1.36 sources, 1.25, 1.26 admin-visibility.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15854

Modified Files:
	.cvsignore kdeaddons.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
3.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	28 Jun 2005 19:55:53 -0000	1.24
+++ .cvsignore	9 Aug 2005 15:22:53 -0000	1.25
@@ -4,3 +4,4 @@
 kdeaddons-3.4.0-rc1.tar.bz2
 kdeaddons-3.4.0.tar.bz2
 kdeaddons-3.4.1.tar.bz2
+kdeaddons-3.4.2.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdeaddons.spec	28 Jun 2005 19:55:53 -0000	1.35
+++ kdeaddons.spec	9 Aug 2005 15:22:53 -0000	1.36
@@ -5,10 +5,12 @@
 %define vimpart 1
 
 %define qt_version 3.3.4
-%define arts_version 1.4.1
+%define arts_version 1.4.2
 %define arts 1
 
-Version: 3.4.1
+%define disable_gcc_check_and_hidden_visibility 1
+%
+Version: 3.4.2
 Release: 1
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
@@ -21,8 +23,6 @@
 Patch2: kdeaddons-3.3.92-vimpart.patch
 Patch3: kdeaddons-3.3.92-db++.patch
 Patch5: kdeaddons-3.4.0-xmms.patch
-# gcc4 workaround
-Patch100: admin-visibility.patch
 
 Prereq: /sbin/ldconfig
 
@@ -86,7 +86,12 @@
 %patch5 -p1 -b .xmms
 %endif
 
-%patch100 -p1 -b .gcc4
+%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
@@ -175,6 +180,9 @@
 %endif
 
 %changelog
+* Tue Aug 09 2005 Than Ngo <than at redhat.com> 3.4.2-1
+- update to 3.4.2
+
 * Tue Jun 28 2005 Than Ngo <than at redhat.com> 3.4.1-1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	28 Jun 2005 19:55:53 -0000	1.25
+++ sources	9 Aug 2005 15:22:53 -0000	1.26
@@ -1 +1 @@
-596c3a7f4ef43e2f0bd760196a6b119b  kdeaddons-3.4.1.tar.bz2
+af4fc7fa0dde8894b9d9582ecef7df2a  kdeaddons-3.4.2.tar.bz2


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