[kdebase/f15] 4.6.5

[Rex Dieter]

commit 679f2952d3ea00f8b8bdf4f4bae1ea49f7e86221
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:38:41 2011 -0500

    4.6.5

 .gitignore   |    5 +----
 kdebase.spec |   17 ++++++-----------
 sources      |    3 +--
 3 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7851f2f..3ba286b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/kdebase-4.6.2.tar.bz2
-/kdebase-4.6.3.tar.bz2
-/kdebase-4.6.4.tar.bz2
-/kde-baseapps-4.6-20110617.tar.bz2
+/kdebase-4.6.5.tar.bz2
diff --git a/kdebase.spec b/kdebase.spec
index 3393619..702f29d 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -1,15 +1,13 @@
 Name:    kdebase
 Summary: KDE Core Applications 
 Epoch:   6
-Version: 4.6.4
-Release: 2%{?dist}
+Version: 4.6.5
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
-# git archive KDE/4.6 dolphin/ kfind/ konqueror/ lib/ nsplugins/ plasma/ | bzip2 > kde-baseapps-4.6-20110617.tar.bz2
-Source1: kde-baseapps-4.6-20110617.tar.bz2 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search path for plugins
@@ -28,10 +26,6 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 Patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
 ## upstream patches
-# https://projects.kde.org/projects/kde/kdebase/kde-baseapps/repository/revisions/12bbb3bf76bc3d12d8a08e347216b88274007f17 
-Patch100: kdebase-4.6.3-nsplugins_sdk_headers.patch
-# https://projects.kde.org/projects/kde/kdebase/kde-baseapps/repository/revisions/b7e487550a29b35072e24adaf4df6eb48264129d
-Patch101: kdebase-4.6.3-nsplugins_flash.patch 
 
 %ifnarch s390 s390x
 Requires: eject
@@ -106,15 +100,13 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 
 
 %prep
-%setup -q -n kdebase-%{version} -a 1
+%setup -q -n kdebase-%{version}
 
 %patch0 -p2 -b .nsplugins-paths
 %patch1 -p2 -b .konsole-activetabindex
 %patch2 -p2 -b .home-icon
 %patch3 -p2 -b .kde#228593
 %patch4 -p2 -b .bz#631481
-#patch100 -p1 -b .nsplugins_sdk_headers
-#patch101 -p1 -b .nsplugins_flash
 
 
 %build
@@ -271,6 +263,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 a 4.6 branch snapshot of updated pieces (kdebase-4.6.4.tar.bz2 inadvertantly included older versions)
 
diff --git a/sources b/sources
index fde8ef4..cb02d3e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-875991779d0b3f47f6c3f9d1e90add47  kdebase-4.6.4.tar.bz2
-ea9ee8104c03b1fd458818f79098e217  kde-baseapps-4.6-20110617.tar.bz2
+153bd43c3b1159c2e6b06fc4f3f0ad87  kdebase-4.6.5.tar.bz2