[kdebase] 4.6.80 by rnovacek

[Jaroslav Reznik]

commit 20f832dc2166e3e61ebb66c9812fc6c15180651f
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Jun 2 17:26:03 2011 +0200

    4.6.80 by rnovacek

 .gitignore                                |    5 +-
 kdebase-4.6.3-nsplugins_flash.patch       |   63 -
 kdebase-4.6.3-nsplugins_sdk_headers.patch | 7937 -----------------------------
 kdebase-4.6.80-packaging_cmake.patch      |   19 +
 kdebase.spec                              |   41 +-
 sources                                   |    4 +-
 6 files changed, 54 insertions(+), 8015 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ee8438..ce1be6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-/kdebase-4.6.2.tar.bz2
-/kdebase-4.6.3.tar.bz2
+/kde-baseapps-4.6.80.tar.bz2
+/kate-4.6.80.tar.bz2
+/konsole-4.6.80.tar.bz2
diff --git a/kdebase-4.6.80-packaging_cmake.patch b/kdebase-4.6.80-packaging_cmake.patch
new file mode 100644
index 0000000..d39bdb0
--- /dev/null
+++ b/kdebase-4.6.80-packaging_cmake.patch
@@ -0,0 +1,19 @@
+diff -up ./kde-baseapps-4.6.80/CMakeLists.txt.packaging_cmake ./kde-baseapps-4.6.80/CMakeLists.txt
+--- ./kde-baseapps-4.6.80/CMakeLists.txt.packaging_cmake	2011-06-01 10:15:10.000000000 +0200
++++ ./kde-baseapps-4.6.80/CMakeLists.txt	2011-06-01 10:16:46.000000000 +0200
+@@ -22,6 +22,7 @@ include_directories (${CMAKE_CURRENT_SOU
+ 
+ add_subdirectory( lib )
+ add_subdirectory( dolphin )
++add_subdirectory( kwrite )
+ add_subdirectory( kdialog )
+ add_subdirectory( keditbookmarks )
+ add_subdirectory( konqueror )
+@@ -34,6 +35,7 @@ if ( Q_WS_MAC )
+ endif ( Q_WS_MAC )
+ 
+ if ( Q_WS_X11 )
++  add_subdirectory( konsole )
+   add_subdirectory( nsplugins )
+   add_subdirectory( kdepasswd )
+ endif ( Q_WS_X11 )
diff --git a/kdebase.spec b/kdebase.spec
index 11176e8..7b61e60 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -1,13 +1,16 @@
 Name:    kdebase
 Summary: KDE Core Applications 
 Epoch:   6
-Version: 4.6.3
-Release: 2%{?dist}
+Version: 4.6.80
+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
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-baseapps-%{version}.tar.bz2
+# Kate and konsole is in separate tarball since 4.6.80
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kate-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/konsole-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # search path for plugins
@@ -25,11 +28,8 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 # Password & User account becomes non responding
 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 
+# packaging hack
+Patch10: kdebase-4.6.80-packaging_cmake.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -104,16 +104,28 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 
 
 %prep
-%setup -q -n kdebase-%{version}%{?alphatag}
+%setup -q -n kde-baseapps-%{version}%{?alphatag}
+# kate and konsole is packaged separately
+# unpack kate
+%setup -q -T -D -a 1 -n kde-baseapps-%{version}%{?alphatag}
+# extract kwrite
+mv kate-%{version}/kwrite ./kwrite
+# get rid of the rest of kate
+rm -rf kate-%{version}
+
+#unpack konsole
+%setup -q -T -D -a 2 -n kde-baseapps-%{version}%{?alphatag}
+# move to proper path
+mv konsole-%{version} konsole
+
+# make kwrite and konsole build within kdebase
+%patch10 -p2 -b .packaging_cmake
 
 %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
 mkdir -p %{_target_platform}
@@ -269,6 +281,11 @@ fi
 
 
 %changelog
+* Wed Jun 01 2011 Radek Novacek <rnovacek at redhat.com> 6:4.6.80-1
+- 4.6.80
+- import separately packaged kwrite and konsole
+- drop upstreamed patches (nsplugins_sdk_headers and nsplugins_flash)
+
 * Mon May 23 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.3-2
 - nspluginviewer crashes with flash-plugin 10.3 (kde#273323)
 
diff --git a/sources b/sources
index dc30d0f..bd0e474 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-4f0627e33bd857beebd92be1065ed83e  kdebase-4.6.3.tar.bz2
+19e5bdb121f1f97aeb69213cd338681d  konsole-4.6.80.tar.bz2
+8f765c3d9e6282f69b5b9287d228bbc9  kde-baseapps-4.6.80.tar.bz2
+ae52cb8bfb9f24746621b62ca2ee24d1  kate-4.6.80.tar.bz2