[kdesdk] 4.6.80 + package kate

Jaroslav Reznik jreznik at fedoraproject.org
Wed Jun 15 15:12:01 UTC 2011


commit 10517f5dfef719498eff5fe76d9b83d94ce8877b
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Wed Jun 15 17:11:48 2011 +0200

    4.6.80 + package kate

 .gitignore                       |    4 ++--
 kdesdk-4.6.80-package-kate.patch |   11 +++++++++++
 kdesdk.spec                      |   19 +++++++++++++++++--
 sources                          |    3 ++-
 4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c22e16..d0b0a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/kdesdk-4.6.2.tar.bz2
-/kdesdk-4.6.3.tar.bz2
+/kdesdk-4.6.80.tar.bz2
+/kate-4.6.80.tar.bz2
diff --git a/kdesdk-4.6.80-package-kate.patch b/kdesdk-4.6.80-package-kate.patch
new file mode 100644
index 0000000..c94ded7
--- /dev/null
+++ b/kdesdk-4.6.80-package-kate.patch
@@ -0,0 +1,11 @@
+diff -up kdesdk-4.6.80/CMakeLists.txt.package-kate kdesdk-4.6.80/CMakeLists.txt
+--- kdesdk-4.6.80/CMakeLists.txt.package-kate	2011-05-20 22:19:17.000000000 +0200
++++ kdesdk-4.6.80/CMakeLists.txt	2011-06-15 17:08:04.379301315 +0200
+@@ -60,6 +60,7 @@ endif(LIBKONQ_FOUND)
+ 
+ # kcachegrind is usable on Windows for XDebug etc.
+ macro_optional_add_subdirectory(kcachegrind)
++macro_optional_add_subdirectory(kate)
+ macro_optional_add_subdirectory(kapptemplate)
+ macro_optional_add_subdirectory(kpartloader)
+ macro_optional_add_subdirectory(strigi-analyzer)
diff --git a/kdesdk.spec b/kdesdk.spec
index e7a60c2..241ec9d 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -1,6 +1,6 @@
 Name:           kdesdk
-Version:        4.6.3
-Release:        3%{?dist}
+Version:        4.6.80
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,6 +8,10 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kate-%{version}.tar.bz2
+
+Patch0:         kdesdk-4.6.80-package-kate.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -87,7 +91,15 @@ xml2pot
 
 %prep
 %setup -q -n kdesdk-%{version}%{?alphatag}
+# kate and konsole are packaged separately
+# unpack kate
+%setup -q -T -D -a 1 -n kdesdk-%{version}%{?alphatag}
+# extract kate app
+mv kate-%{version}/kate ./kate
+# get rid of the rest of kate
+rm -rf kate-%{version}
 
+%patch0 -p1 -b .package-kate
 
 %build
 mkdir -p %{_target_platform}
@@ -251,6 +263,9 @@ fi
 
 
 %changelog
+* Wed Jun 15 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.80-1
+- 4.6.80 (beta1)
+
 * Thu May 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.3-3
 - rebuid (hunspell)
 
diff --git a/sources b/sources
index 0733ee0..4d92cda 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-c4a223067a228688c6b62a6bdd67a022  kdesdk-4.6.3.tar.bz2
+8a72101d21100c96c02205ae01be4973  kdesdk-4.6.80.tar.bz2
+ae52cb8bfb9f24746621b62ca2ee24d1  kate-4.6.80.tar.bz2


More information about the scm-commits mailing list