[kdebase/f15] include a 4.6 branch snapshot of updated pieces (kdebase-4.6.4.tar.bz2 inadvertantly included older

[Rex Dieter]

commit 2d668c0345344db15208e35056e74ce3fa69e0cc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jun 17 10:48:07 2011 -0500

    include a 4.6 branch snapshot of updated pieces (kdebase-4.6.4.tar.bz2 inadvertantly included older versions)

 .gitignore   |    1 +
 kdebase.spec |   13 +++++++++----
 sources      |    1 +
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fa9069..7851f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /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
diff --git a/kdebase.spec b/kdebase.spec
index a13d30d..3393619 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -2,12 +2,14 @@ Name:    kdebase
 Summary: KDE Core Applications 
 Epoch:   6
 Version: 4.6.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -104,15 +106,15 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 
 
 %prep
-%setup -q -n kdebase-%{version}%{?alphatag}
+%setup -q -n kdebase-%{version} -a 1
 
 %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
+#patch100 -p1 -b .nsplugins_sdk_headers
+#patch101 -p1 -b .nsplugins_flash
 
 
 %build
@@ -269,6 +271,9 @@ fi
 
 
 %changelog
+* 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)
+
 * Mon Jun 06 2011 Than Ngo <than at redhat.com> - 6:4.6.4-1
 - 4.6.4
 
diff --git a/sources b/sources
index 9e4af2d..fde8ef4 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 875991779d0b3f47f6c3f9d1e90add47  kdebase-4.6.4.tar.bz2
+ea9ee8104c03b1fd458818f79098e217  kde-baseapps-4.6-20110617.tar.bz2