From 2419188f00eb8138c458ff475118f2adc3105edd Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Jun 09 2011 14:00:56 +0000
Subject: Merge branch 'f15' into f14


---

diff --git a/.gitignore b/.gitignore
index 0a7a61b..1a443ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdegraphics-4.6.2.tar.bz2
 /kdegraphics-4.6.3.tar.bz2
+/kdegraphics-4.6.4.tar.bz2
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 9d7627a..e31ee7b 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -12,8 +12,8 @@
 
 Summary:        KDE Graphics Applications
 Epoch:          7
-Version:        4.6.3
-Release:        2%{?dist}
+Version:        4.6.4
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -272,6 +272,7 @@ fi
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/cmake/KSane/
 %{_kde4_libdir}/cmake/Okular/
+%{_kde4_appsdir}/cmake/modules/*
 %{_libdir}/pkgconfig/*.pc
 
 %files -n kio_msits
@@ -281,6 +282,9 @@ fi
 
 
 %changelog
+* Mon Jun 06 2011 Than Ngo <than@redhat.com> - 4.6.4-1
+- 4.6.4
+
 * Mon Jun 06 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.3-2
 - fix printing of landscape documents in Okular (#509645, kde#181290)
 
diff --git a/sources b/sources
index 619cb48..a30d6f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26c2eca2d707f9fc69db87c0467e5849  kdegraphics-4.6.3.tar.bz2
+91b52d9a7b5bd9874d5f947b4c196327  kdegraphics-4.6.4.tar.bz2