[kwebkitpart] 1.3.3

Rex Dieter rdieter at fedoraproject.org
Thu Dec 5 00:14:59 UTC 2013


commit 6779c4be228060583d06ae47f0694cbe1d5a99df
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Dec 4 18:14:57 2013 -0600

    1.3.3

 kwebkitpart-1.3.3-kdelauncher.patch |   12 ++++++++++++
 kwebkitpart.spec                    |    8 ++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/kwebkitpart-1.3.3-kdelauncher.patch b/kwebkitpart-1.3.3-kdelauncher.patch
new file mode 100644
index 0000000..b417934
--- /dev/null
+++ b/kwebkitpart-1.3.3-kdelauncher.patch
@@ -0,0 +1,12 @@
+diff -up kwebkitpart-1.3.3/CMakeLists.txt.kdelauncher kwebkitpart-1.3.3/CMakeLists.txt
+--- kwebkitpart-1.3.3/CMakeLists.txt.kdelauncher	2013-12-04 16:21:26.000000000 -0600
++++ kwebkitpart-1.3.3/CMakeLists.txt	2013-12-04 18:13:06.630103176 -0600
+@@ -9,7 +9,7 @@ add_definitions(-DQT_USE_FAST_CONCATENAT
+ 
+ add_subdirectory(icons)
+ add_subdirectory(src)
+-add_subdirectory(kdelauncher)
+ 
+ include(MacroOptionalAddSubdirectory)
++macro_optional_add_subdirectory(kdelauncher)
+ macro_optional_add_subdirectory( po )
diff --git a/kwebkitpart.spec b/kwebkitpart.spec
index 771b702..6e93308 100644
--- a/kwebkitpart.spec
+++ b/kwebkitpart.spec
@@ -9,6 +9,9 @@ URL:     https://projects.kde.org/projects/extragear/base/kwebkitpart
 # use releaseme script to generate
 Source0: kwebkitpart-%{version}.tar.xz
 
+## upstreamable patches
+Patch50: kwebkitpart-1.3.3-kdelauncher.patch
+
 ## upstream patches
 #define git_patches 1
 %if 0%{?git_patches}
@@ -43,6 +46,8 @@ git commit -a -q -m "%{version} baseline."
 
 # Apply all the patches
 git am -p1 %{patches} < /dev/null
+%else
+%patch50 -p1 -b .kdelauncher
 %endif
 
 %ifarch ppc ppc64 s390 s390x
@@ -96,6 +101,9 @@ fi
 
 
 %changelog
+* Wed Dec 04 2013 Rex Dieter <rdieter at fedoraproject.org> 1.3.3-1
+- 1.3.3
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list