From 0d4b2e09f33dd1ff07124fd1c13dec1ca2333ac2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 29 Jan 2010 16:07:57 +0000 Subject: [PATCH] * Fri Jan 29 2010 Rex Dieter - 4.3.5-2 - patch for kde4-config --kde-version option (kde#224540) --- kdelibs-4.3.5-kde-config_kde-version.patch | 21 +++++++++++++++++++++ kdelibs.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.3.5-kde-config_kde-version.patch diff --git a/kdelibs-4.3.5-kde-config_kde-version.patch b/kdelibs-4.3.5-kde-config_kde-version.patch new file mode 100644 index 0000000..7d3817a --- /dev/null +++ b/kdelibs-4.3.5-kde-config_kde-version.patch @@ -0,0 +1,21 @@ +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; diff --git a/kdelibs.spec b/kdelibs.spec index b593895..16e5c0f 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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.patch # 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 - 4.3.5-2 +- patch for kde4-config --kde-version option (kde#224540) + * Fri Jan 22 2010 Rex Dieter - 4.3.5-1 - 4.3.5