From 779700bf97f4e91efa4f421e486fe586de64c05d5afa954a966148ab7a4624bf Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 26 Feb 2013 21:26:37 +0000
Subject: [PATCH] Accepting request 156475 from
home:dimstar:branches:GNOME:Factory
- Do not package gnome-control-center.rules (bnc#804966): On
openSUSE defining the use of the wheel group is up to the
administrator.
OBS-URL: https://build.opensuse.org/request/show/156475
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=176
---
gnome-control-center.changes | 7 +++++++
gnome-control-center.spec | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index adb154d..d8780e0 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 26 20:23:09 UTC 2013 - dimstar@opensuse.org
+
+- Do not package gnome-control-center.rules (bnc#804966): On
+ openSUSE defining the use of the wheel group is up to the
+ administrator.
+
-------------------------------------------------------------------
Tue Jan 29 10:49:35 UTC 2013 - idonmez@suse.com
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index b318d82..20b75e8 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -26,7 +26,6 @@
Name: gnome-control-center
Version: 3.6.3
Release: 0
-# FIXME: stop owning %%{_datadir}/polkit-1/rules.d once polkit >= 0.106 is in (should be soon-ish, end of 09/2012)
# FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
Summary: The GNOME Control Center
License: GPL-2.0+
@@ -191,10 +190,10 @@ make %{?_smp_mflags} V=1
%install
%make_install
-%if 0%{?suse_version} <= 1120
-rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
find %{buildroot} -type f -name "*.la" -delete -print
+
+# We do not package gnome-control-center.rules (bnc#804966)
+rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%find_lang %{name}-2.0 %{?no_lang_C}
%find_lang %{name}-2.0-timezones %{name}-2.0.lang
%suse_update_desktop_file gnome-control-center
@@ -245,7 +244,8 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/*/*/*.svg
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
%{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
-%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
+# We do not package gnome-control-center.rules
+#{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%dir %{_datadir}/sounds/gnome
%dir %{_datadir}/sounds/gnome/default
%dir %{_datadir}/sounds/gnome/default/alerts