jreznik pushed to kdelibs3 (epel7). "kate has a file conflict with kdelibs3 (#883529)"

[notifications at fedoraproject.org]

>From 8a2c12c525936786cb382817aa92cbcf44a0fabd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 4 Dec 2012 15:56:40 -0600
Subject: kate has a file conflict with kdelibs3 (#883529)


diff --git a/kdelibs-3.5.10-kate_defaults.patch b/kdelibs-3.5.10-kate_defaults.patch
new file mode 100644
index 0000000..929af8c
--- /dev/null
+++ b/kdelibs-3.5.10-kate_defaults.patch
@@ -0,0 +1,25 @@
+diff -up kdelibs-3.5.10/kate/part/katejscript.cpp.kate_defaults kdelibs-3.5.10/kate/part/katejscript.cpp
+--- kdelibs-3.5.10/kate/part/katejscript.cpp.kate_defaults	2007-01-15 05:33:48.000000000 -0600
++++ kdelibs-3.5.10/kate/part/katejscript.cpp	2012-12-04 15:52:52.162501234 -0600
+@@ -646,7 +646,7 @@ void KateJScriptManager::collectScripts
+ 
+   // figure out if the kate install is too new
+   config.setGroup ("General");
+-  if (config.readNumEntry ("Version") > config.readNumEntry ("CachedVersion"))
++  if (config.readNumEntry ("Version", 14) > config.readNumEntry ("CachedVersion", 0))
+   {
+     config.writeEntry ("CachedVersion", config.readNumEntry ("Version"));
+     force = true;
+diff -up kdelibs-3.5.10/kate/part/kateluaindentscript.cpp.kate_defaults kdelibs-3.5.10/kate/part/kateluaindentscript.cpp
+diff -up kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp.kate_defaults kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp
+--- kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp.kate_defaults	2005-10-10 10:05:26.000000000 -0500
++++ kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp	2012-12-04 15:53:38.394931447 -0600
+@@ -339,7 +339,7 @@ void KateSyntaxDocument::setupModeList (
+ 
+   // figure our if the kate install is too new
+   config.setGroup ("General");
+-  if (config.readNumEntry ("Version") > config.readNumEntry ("CachedVersion"))
++  if (config.readNumEntry ("Version", 14) > config.readNumEntry ("CachedVersion", 0))
+   {
+     config.writeEntry ("CachedVersion", config.readNumEntry ("Version"));
+     force = true;
diff --git a/kdelibs3.spec b/kdelibs3.spec
index eabd265..586f6c7 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -28,7 +28,7 @@
 Summary: KDE 3 Libraries
 Name:    kdelibs3
 Version: 3.5.10
-Release: 39%{?dist}
+Release: 40%{?dist}
 
 License: LGPLv2
 Url: http://www.kde.org/
@@ -75,6 +75,8 @@ Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
 Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
 # remove flawed and obsolete automake version check in admin/cvs.sh
 Patch58: kdelibs-3.5.10-automake-version.patch
+# put katesyntaxhighlightingrc defaults in code (#883529)
+patch59: kdelibs-3.5.10-kate_defaults.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -247,6 +249,7 @@ format for easy browsing
 %patch56 -p1 -b .qcolor_gcc_ftbfs
 %patch57 -p1 -b .cups-util
 %patch58 -p1 -b .automake-version
+%patch59 -p1 -b .kate_defaults
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -446,6 +449,8 @@ rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
 rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
 rm -f %{buildroot}%{_datadir}/config/ksslcalist
 rm -f %{buildroot}%{_bindir}/preparetips
+# remove conflicts with kate-4.8.80+
+rm -fv %{buildroot}%{_datadir}/config/katesyntaxhighlightingrc
 
 # don't show kresources
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
@@ -590,6 +595,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-40
+- kate has a file conflict with kdelibs3 (#883529)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=8a2c12c525936786cb382817aa92cbcf44a0fabd