From cb4d90a51b5c1fbcd42a1b2ef604e650a67c93f2 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Apr 05 2006 17:38:01 +0000
Subject: update to 3.5.2


---

diff --git a/kdegraphics-3.5.2-kpdf-xft.patch b/kdegraphics-3.5.2-kpdf-xft.patch
new file mode 100644
index 0000000..82babd2
--- /dev/null
+++ b/kdegraphics-3.5.2-kpdf-xft.patch
@@ -0,0 +1,12 @@
+--- kdegraphics-3.5.2/kpdf/configure.in.in.kpdf-xft	2006-03-17 11:11:19.000000000 +0100
++++ kdegraphics-3.5.2/kpdf/configure.in.in	2006-04-04 17:54:13.000000000 +0200
+@@ -40,6 +40,9 @@
+   if "$XFT_CONFIG"; then
+     XFT_CFLAGS="`$XFT_CONFIG --cflags`"
+     XFT_LIBS="`$XFT_CONFIG --libs`"
++  else
++    XFT_CFLAGS="`pkg-config xft --cflags 2>/dev/null`"
++    XFT_LIBS="`pkg-config xft --libs 2>/dev/null`"
+   fi
+   AC_SUBST(XFT_CFLAGS)
+   AC_SUBST(XFT_LIBS)
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 353b4e9..8883c41 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -11,17 +11,19 @@
 %define arts 1
 %define make_cvs 1
 
+%define appdir %{_datadir}/applications/kde
+
 %define no_scanner_archs s390 s390x
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.1
-Release: 4
+Version: 3.5.2
+Release: 1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
 Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{rfelease}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -30,15 +32,9 @@ Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: kdegraphics-3.5.1-warning.patch
-Patch4: kdegraphics-3.5.1-kpdf-xft.patch
+Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 Patch5: kdegraphics-3.5.1-gphoto2-config.patch
 
-# upstream patches
-Patch50: kdegraphics-3.5.1-kpdf.patch
-
-# security patches
-Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
-
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -276,18 +272,11 @@ This package contains a model editor for the PovRay raytracer.
 %patch4 -p1 -b .kpdf-xft
 %patch5 -p1 -b .gphoto2-config
 
-# upstream patches
-%patch50 -p1 -b .kpdf
-
-# security patches
-%patch100 -p0 -b .CVE-2006-0301
-
 %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
@@ -321,13 +310,13 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 %if %{final}
    --enable-final \
 %endif
-   --includedir=/usr/include/kde \
-   --with-xinerama \
+   --includedir=%{_includedir}/kde \
 %ifnarch %{no_scanner_archs}
    --with-kamera \
 %else
-   --without-kamera
+   --without-kamera \
 %endif
+   --with-xinerama
 
 make %{?_smp_mflags}
 
@@ -345,9 +334,9 @@ for i in *; do
 done
 popd
 
-if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
-  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
-fi
+for i in kcmkmrml ksnapshot ; do
+  [ -f $RPM_BUILD_ROOT%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{appdir}/$i.desktop
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -379,6 +368,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
+* Wed Apr 05 2006 Than Ngo <than@redhat.com> 7:3.5.2-1
+- update to 3.5.2
+
 * Tue Mar 14 2006 Than Ngo <than@redhat.com> 7:3.5.1-4
 - fix build problem with gphoto2
 
diff --git a/sources b/sources
index cf5a35d..28ba0c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2
+8e1816a2191ea85b889930159a5d1e46  kdegraphics-3.5.2.tar.bz2