From 813155b0334cb07d0ca449960bd0b0194538bbca Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Aug 11 2005 10:07:18 +0000
Subject: update to 3.4.2


---

diff --git a/.cvsignore b/.cvsignore
index 4f2999f..3277194 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ kdegraphics-3.3.2.tar.bz2
 kdegraphics-3.4.0-rc1.tar.bz2
 kdegraphics-3.4.0.tar.bz2
 kdegraphics-3.4.1.tar.bz2
+kdegraphics-3.4.2.tar.bz2
diff --git a/kdegraphics.spec b/kdegraphics.spec
index dd69c8b..2168881 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -10,8 +10,10 @@
 
 %define no_scanner_archs s390 s390x
 
-Version: 3.4.1
-Release: 2
+%define disable_gcc_check_and_hidden_visibility 1
+
+Version: 3.4.2
+Release: 1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -23,9 +25,6 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
-Patch3: admin-visibility.patch
-Patch4: kdegraphics-3.4.1-gcc4.patch
-Patch5: kdegraphics-3.4.1-dviwin_draw.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -260,21 +259,24 @@ This package contains a model editor for the PovRay raytracer.
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
-%patch3 -p1 -b .gcc
-%patch4 -p1 -b .gcc4
-%patch5 -p1 -b .gcc4
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
 %endif
 
-
 # disable kpovmodeler temporary. waiting for freeglut
 %if !%{kpovmodeler}
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %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
@@ -319,7 +321,9 @@ for i in *; do
 done
 popd
 
-echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
+if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
+  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -352,6 +356,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
+* Thu Aug 11 2005 Than Ngo <than@redhat.com> 7:3.4.2-1
+- update to 3.4.2
+
 * Mon Jul 04 2005 Than Ngo <than@redhat.com> 7:3.4.1-2
 - apply gcc4 workaround to fix #162430
 
diff --git a/sources b/sources
index 7884b44..1b0c532 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d91ef530a416bd8407abb28103bc049c  kdegraphics-3.4.1.tar.bz2
+50916460952c4142329a7c6a47fe1530  kdegraphics-3.4.2.tar.bz2