[kdegraphics/f15] 4.6.5

[Rex Dieter]

commit 544d73c5192f81c1c6bf7ee77f5b40f087195082
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:44:21 2011 -0500

    4.6.5

 .gitignore       |    5 +----
 kdegraphics.spec |   13 +++++--------
 sources          |    3 +--
 3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f01bea9..e4c921f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/kdegraphics-4.6.2.tar.bz2
-/kdegraphics-4.6.3.tar.bz2
-/kdegraphics-4.6.4.tar.bz2
-/okular-0.12.4-20110617.tar.bz2
+/kdegraphics-4.6.5.tar.bz2
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 8fb1b52..6ebafe4 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -12,8 +12,8 @@
 
 Summary:        KDE Graphics Applications
 Epoch:          7
-Version:        4.6.4
-Release:        2%{?dist}
+Version:        4.6.5
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -23,9 +23,6 @@ Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
-# HACK, 4.6.4 included an older version of okular by mistake, here's what it should be
-# git archive --prefix=okular/ 4.6 | bzip2 -9 > ../okular-0.12.4-20110617.tar.bz2
-Source1:        okular-0.12.4-20110617.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
@@ -133,9 +130,6 @@ Summary: A kioslave for displaying WinHelp files
 %prep
 %setup -q -n kdegraphics-%{version}%{?alphatag}
 
-rm -rf okular/
-%setup -q -T -D -a 1
-
 %patch50 -p1 -b .okular_dt
 %patch51 -p1 -b .OkularConfig
 %patch53 -p1 -b .libjpeg_version
@@ -290,6 +284,9 @@ fi
 
 
 %changelog
+* Fri Jul 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-1
+- 4.6.5
+
 * Fri Jun 17 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.4-2
 - include okular-0.12.4 (kdegraphics-4.6.4.tar.bz2 inadvertantly included an older version)
 
diff --git a/sources b/sources
index f9d9f0e..92f0645 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-91b52d9a7b5bd9874d5f947b4c196327  kdegraphics-4.6.4.tar.bz2
-6fd0bc698467b960ba893155c32cb6fa  okular-0.12.4-20110617.tar.bz2
+1495ce71f689b238f626ad7fbc53d83b  kdegraphics-4.6.5.tar.bz2