jreznik pushed to kdelibs3 (epel7). "- patch for kde-config --kde-version option (kde#224540)"

[notifications at fedoraproject.org]

>From 20c92620a7c65d39b20994bb84b6e6ad9d8a5cfe Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri, 29 Jan 2010 16:33:16 +0000
Subject: - patch for kde-config --kde-version option (kde#224540)


diff --git a/kdelibs-3.5.10-kde-config_kde-version.patch b/kdelibs-3.5.10-kde-config_kde-version.patch
new file mode 100644
index 0000000..a08250f
--- /dev/null
+++ b/kdelibs-3.5.10-kde-config_kde-version.patch
@@ -0,0 +1,21 @@
+diff -up kdelibs-3.5.10/kdecore/kde-config.cpp.in.kde-config_kde-version kdelibs-3.5.10/kdecore/kde-config.cpp.in
+--- kdelibs-3.5.10/kdecore/kde-config.cpp.in.kde-config_kde-version	2005-09-10 03:27:12.000000000 -0500
++++ kdelibs-3.5.10/kdecore/kde-config.cpp.in	2010-01-29 10:30:16.846715263 -0600
+@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
+     { "exec-prefix", I18N_NOOP("Compiled in exec_prefix for KDE libraries"), 0 },
+     { "libsuffix", I18N_NOOP("Compiled in library path suffix"), 0 },
+     { "localprefix", I18N_NOOP("Prefix in $HOME used to write files"), 0},
+-    { "version",   I18N_NOOP("Compiled in version string for KDE libraries"), 0 },
++    { "kde-version",   I18N_NOOP("Compiled in version string for KDE libraries"), 0 },
+     { "types",     I18N_NOOP("Available KDE resource types"), 0 },
+     { "path type", I18N_NOOP("Search path for resource type"), 0 },
+     { "userpath type", I18N_NOOP("User path: desktop|autostart|trash|document"), 0 },
+@@ -154,7 +154,7 @@ int main(int argc, char **argv)
+         return 0;
+     }
+ 
+-    if (args->isSet("version"))
++    if (args->isSet("kde-version"))
+     {
+         printf("%s\n", KDE_VERSION_STRING);
+         return 0;
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 26d9454..98b2b26 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -27,7 +27,7 @@
 
 Summary: KDE 3 Libraries
 Version: 3.5.10
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -86,6 +86,8 @@ Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch
 Patch110: arts-acinclude.patch
+# kde4.4 backport
+Patch111: kdelibs-3.5.10-kde-config_kde-version.patch
 
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
@@ -252,6 +254,7 @@ format for easy browsing
 %patch108 -p1 -b .alias
 %patch109 -p1 -b .kabc
 %patch110 -p1 -b .autoconf
+%patch111 -p1 -b .kde-config_kde-version
 
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
@@ -585,6 +588,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-23
+- patch for kde-config --kde-version option (kde#224540)
+
 * Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 3.5.10-22
 - Repositioning the KDE Brand (#547361)
 
@@ -593,7 +599,6 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 - backport upstream patches
 - patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)
 
-
 * Mon Nov  2 2009 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.10-20
 - fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428
 
-- 
cgit v0.10.2


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