rpms/kdelibs/F-12 kdelibs-4.3.5-kde-config_kde-version.patch, NONE, 1.1 kdelibs.spec, 1.536, 1.537

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24146

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.5-kde-config_kde-version.patch 
Log Message:
* Fri Jan 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-2
- patch for kde4-config --kde-version option (kde#224540)


kdelibs-4.3.5-kde-config_kde-version.patch:
 kde-config.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.5-kde-config_kde-version.patch ---
diff -up kdelibs-4.3.5/kdecore/kde-config.cpp.kde-config_kde-version kdelibs-4.3.5/kdecore/kde-config.cpp
--- kdelibs-4.3.5/kdecore/kde-config.cpp.kde-config_kde-version	2009-10-30 07:26:05.000000000 -0500
+++ kdelibs-4.3.5/kdecore/kde-config.cpp	2010-01-29 10:01:52.147714559 -0600
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
     options.add("exec-prefix", ki18n("Compiled in exec_prefix for KDE libraries"));
     options.add("libsuffix",   ki18n("Compiled in library path suffix"));
     options.add("localprefix", ki18n("Prefix in $HOME used to write files"));
-    options.add("version",     ki18n("Compiled in version string for KDE libraries"));
+    options.add("kde-version", ki18n("Compiled in version string for KDE libraries"));
     options.add("types",       ki18n("Available KDE resource types"));
     options.add("path type",       ki18n("Search path for resource type"));
     options.add("locate filename", ki18n("Find filename inside the resource type given to --path"));
@@ -122,7 +122,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;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -p -r1.536 -r1.537
--- kdelibs.spec	22 Jan 2010 19:10:33 -0000	1.536
+++ kdelibs.spec	29 Jan 2010 16:04:26 -0000	1.537
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -90,6 +90,8 @@ Patch100: kdelibs-4.3.3-adFilteredBy.pat
 # http://websvn.kde.org/?view=revision&revision=1056377
 # sonnet was broken with indic, asian, arabic
 Patch101: kdelibs-4.4-sonnet.patch
+# 4.4/trunk
+Patch102: kdelibs-4.3.5-kde-config_kde-version.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -216,6 +218,7 @@ format for easy browsing.
 # 4.4
 %patch100 -p0 -b .adFilteredBy
 %patch101 -p1 -b .sonnet
+%patch102 -p1 -b .kde-config_kde-version
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -408,6 +411,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-2
+- patch for kde4-config --kde-version option (kde#224540)
+
 * Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
 - 4.3.5