[xsettings-kde] * Tue Jan 17 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.12.3-1 - update to 0.12.3 - drop upstrea

[Kevin Kofler]

commit c51c39db2eaa5c80bfa793978983f3927229caa9
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Tue Jan 17 23:11:23 2012 +0100

    * Tue Jan 17 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.12.3-1
    - update to 0.12.3
    - drop upstreamed immodule patch
    - rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk)

 .gitignore                           |    1 +
 sources                              |    2 +-
 xsettings-kde-0.12.2-immmodule.patch |  115 ----------------------------------
 xsettings-kde.spec                   |   16 ++++-
 4 files changed, 14 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 320da56..697744a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xsettings-kde-0.11-20090829svn.tar.bz2
 /xsettings-kde-0.12.tar.bz2
 /xsettings-kde-0.12.2.tar.bz2
+/xsettings-kde-0.12.3.tar.bz2
diff --git a/sources b/sources
index 521f8e3..fe44157 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31d2e6b07f49dd25c1e909594ed69489  xsettings-kde-0.12.2.tar.bz2
+312375c139d9acfef4abadc1e22b9449  xsettings-kde-0.12.3.tar.bz2
diff --git a/xsettings-kde.spec b/xsettings-kde.spec
index c653772..d8db3fc 100644
--- a/xsettings-kde.spec
+++ b/xsettings-kde.spec
@@ -1,8 +1,8 @@
 
 Summary: XSettings Daemon for KDE
 Name:    xsettings-kde
-Version: 0.12.2
-Release: 3%{?dist}
+Version: 0.12.3
+Release: 1%{?dist}
 License: GPLv2+
 Group:   User Interface/Desktops 
 Source0: http://distro.ibiblio.org/pub/linux/distributions/mageia/software/xsettings-kde/%{version}/xsettings-kde-%{version}.tar.bz2 
@@ -11,9 +11,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora doesn't use ~/.kde4 like mandriva
 Patch1: xsettings-kde-0.9-kde4.patch
+# rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk)
+# This makes sure GTK+ 3 also picks up the theme setting from kcm-gtk.
+# TODO: Discuss with upstream.
+Patch2: xsettings-kde-0.12.3-gtktheme.patch
 
 ## upstreamable patches
-Patch50: xsettings-kde-0.12.2-immmodule.patch
 
 Source10: xsettings-kde.desktop
 
@@ -31,7 +34,7 @@ default font and so on.
 %setup -q
 
 %patch1 -p1 -b .kde4
-%patch50 -p1 -b .immodule
+%patch2 -p1 -b .gtktheme
 
 
 %build
@@ -60,6 +63,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 17 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.12.3-1
+- update to 0.12.3
+- drop upstreamed immodule patch
+- rewrite Net/ThemeName handling: set it based on .gtkrc-2.0-kde4 (kcm-gtk)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild