raveit65 pushed to mate-control-center (f22). "Merge branch 'master' into f22"

[notifications at fedoraproject.org]

>From f4f2760cea97336d502b5da406270d3516641c16 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Thu, 26 Mar 2015 01:36:43 +0100
Subject: fix pkexec issues with mate-control-center


diff --git a/mate-control-center.spec b/mate-control-center.spec
index 2176a1c..65ce39e 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -14,7 +14,7 @@
 
 Name:          mate-control-center
 Version:       %{branch}.90
-Release:       1%{?dist}
+Release:       2%{?dist}
 #Release:       0.6%{?git_rel}%{?dist}
 Summary:       MATE Desktop control-center
 License:       LGPLv2+ and GPLv2+
@@ -26,6 +26,10 @@ URL:           http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
+# rhbz (#972534)
+#https://github.com/mate-desktop/mate-control-center/pull/152
+Patch0:        mate-control-center_fix-pkexec-wth-m_c_c.patch
+
 BuildRequires: dconf-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -79,6 +83,8 @@ Development files for mate-control-center
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
+%patch0 -p1 -b .pkexec
+
 # To work around rpath
 autoreconf -fi
 
@@ -176,6 +182,9 @@ fi
 
 
 %changelog
+* Thu Mar 05 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.90.2
+- fix pkexec issue with mate-control-center, rhbz (#972534)
+
 * Thu Mar 05 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.90.1
 - update to 1.9.90 release
 
diff --git a/mate-control-center_fix-pkexec-wth-m_c_c.patch b/mate-control-center_fix-pkexec-wth-m_c_c.patch
new file mode 100644
index 0000000..9dbd8c1
--- /dev/null
+++ b/mate-control-center_fix-pkexec-wth-m_c_c.patch
@@ -0,0 +1,14 @@
+diff --git a/libslab/slab-mate-util.c b/libslab/slab-mate-util.c
+index a4527dc..2acf9d0 100644
+--- a/libslab/slab-mate-util.c
++++ b/libslab/slab-mate-util.c
+@@ -127,7 +127,7 @@ open_desktop_item_exec (MateDesktopItem * desktop_item)
+ 	if (!desktop_item)
+ 		return FALSE;
+ 
+-	mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE, &error);
++	mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE | MATE_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD, &error);
+ 
+ 	if (error)
+ 	{
+
diff --git a/mate-control-center_typo-in-gsettings-key.patch b/mate-control-center_typo-in-gsettings-key.patch
deleted file mode 100644
index 06ae092..0000000
--- a/mate-control-center_typo-in-gsettings-key.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr mate-control-center-1.8.1-orig/capplets/keyboard/mate-keyboard-properties-a11y.c mate-control-center-1.8.1/capplets/keyboard/mate-keyboard-properties-a11y.c
---- mate-control-center-1.8.1-orig/capplets/keyboard/mate-keyboard-properties-a11y.c	2014-03-05 21:55:21.000000000 +0100
-+++ mate-control-center-1.8.1/capplets/keyboard/mate-keyboard-properties-a11y.c	2014-04-19 13:40:12.534518738 +0200
-@@ -145,7 +145,7 @@ notifications_button_clicked_cb (GtkWidg
- 	g_settings_bind (a11y_settings, "feature-state-change-beep", w, "active", G_SETTINGS_BIND_DEFAULT);
- 
- 	w = NWID ("togglekeys_enable");
--	g_settings_bind (a11y_settings, "togglekeys_-enable", w, "active", G_SETTINGS_BIND_DEFAULT);
-+	g_settings_bind (a11y_settings, "togglekeys-enable", w, "active", G_SETTINGS_BIND_DEFAULT);
- 
- 	w = NWID ("stickykeys_modifier_beep");
- 	g_settings_bind (a11y_settings, "stickykeys-modifier-beep", w, "active", G_SETTINGS_BIND_DEFAULT);
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mate-control-center.git/commit/?h=f22&id=406cc14b2484b8a46c267a23ed7cfe14ae16a511