[cinnamon-control-center/f19] update to latest git

[leigh123linux]

commit 2399f7fee3aecb6c821a803605be8bb5ee7b7f54
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jul 27 19:07:35 2013 +0100

    update to latest git
    
    - fix icon name in color desktop file

 .gitignore                   |    1 +
 cinnamon-control-center.spec |   29 +++++++++++++++++------------
 sources                      |    2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 640f429..6edc067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cinnamon-control-center-1.9.0.git430927a.tar.gz
+/cinnamon-control-center-1.9.0.git7d365d0.tar.gz
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 105dea3..9696589 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -1,4 +1,4 @@
-%global _internal_version  430927a
+%global _internal_version  7d365d0
 
 %global gettext_package cinnamon-control-center-2.0
 
@@ -14,7 +14,7 @@
 Summary: Utilities to configure the Cinnamon desktop
 Name:    cinnamon-control-center
 Version: 1.9.0
-Release: 0.3.git%{_internal_version}%{?dist}
+Release: 0.4.git%{_internal_version}%{?dist}
 # The following files contain code from
 # ISC for panels/network/rfkill.h
 # And MIT for wacom/calibrator/calibrator.c
@@ -40,8 +40,6 @@ Requires: dbus-x11
 Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
 # we need XRRGetScreenResourcesCurrent
 Requires: libXrandr >= %{libXrandr_version}
-# for user accounts
-Requires: accountsservice
 # For the user languages
 Requires: iso-codes
 # For the sound panel and gnome-sound-applet
@@ -74,7 +72,8 @@ BuildRequires: dbus-devel >= 0.90
 BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: libcanberra-devel
 BuildRequires: chrpath
-BuildRequires: pulseaudio-libs-devel libcanberra-devel
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: libcanberra-devel
 BuildRequires: upower-devel
 BuildRequires: NetworkManager-glib-devel >= 0.9
 BuildRequires: libnm-gtk-devel >= 0.9
@@ -83,7 +82,9 @@ BuildRequires: gnome-common
 BuildRequires: cups-devel
 BuildRequires: libgtop2-devel
 BuildRequires: iso-codes-devel
-BuildRequires: cheese-libs-devel >= 1:3.0.1 clutter-gst-devel clutter-gtk-devel
+BuildRequires: cheese-libs-devel >= 1:3.0.1
+BuildRequires: clutter-gst-devel
+BuildRequires: clutter-gtk-devel
 BuildRequires: gnome-online-accounts-devel
 BuildRequires: colord-devel
 BuildRequires: libnotify-devel
@@ -124,14 +125,15 @@ utilities for testing Metacity/Muffin themes.
 
 %prep
 %setup -q -n linuxmint-%{name}-%{_internal_version}
-NOCONFIGURE=1 autoreconf -fi
+autoreconf -fi
 
 %build
 %configure \
         --disable-static \
         --disable-update-mimedb \
         --with-libsocialweb=no \
-        --enable-systemd
+        --enable-systemd \
+        --enable-ibus
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -142,6 +144,9 @@ make V=1 %{?_smp_mflags}
 %install
 %make_install
 
+desktop-file-edit                                       \
+  --set-icon=cinnamon-preferences-color                 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-color-panel.desktop
 desktop-file-install                                    \
   --delete-original                                     \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
@@ -173,13 +178,11 @@ fi
 %files -f %{gettext_package}.lang
 %doc AUTHORS COPYING README
 %{_datadir}/cinnamon-control-center/ui/
-%{_datadir}/cinnamon-control-center/pixmaps/
 %{_datadir}/cinnamon-control-center/sounds/cinnamon-sounds-default.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/desktop-directories/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/cinnamon-control-center/icons/
-%{_datadir}/polkit-1/actions/org.cinnamon.controlcenter.*.policy
 %{_datadir}/sounds/cinnamon/default/*/*.ogg
 # list all binaries explicitly, so we notice if one goes missing
 %{_bindir}/cinnamon-control-center
@@ -196,9 +199,7 @@ fi
 %{_libdir}/cinnamon-control-center-1/panels/libscreen.so
 %{_libdir}/cinnamon-control-center-1/panels/libsoundnua.so
 %{_libdir}/cinnamon-control-center-1/panels/libuniversal-access.so
-%{_libdir}/cinnamon-control-center-1/panels/libuser-accounts.so
 
-%{_datadir}/pixmaps/cinnamon/
 %{_datadir}/polkit-1/rules.d/cinnamon-control-center.rules
 
 %files filesystem
@@ -211,6 +212,10 @@ fi
 %{_libdir}/pkgconfig/libcinnamon-control-center.pc
 
 %changelog
+* Sat Jul 27 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.0-0.4.git7d365d0
+- update to latest git
+- fix icon name in color desktop file
+
 * Wed Jul 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.0-0.3.git430927a
 - add missing licences to tag
 - remove requires alsa-lib
diff --git a/sources b/sources
index 1df2f65..e6e9a2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b477bd2ccd02f67af3a0619ec5024b55  cinnamon-control-center-1.9.0.git430927a.tar.gz
+ade3f4294b959e9487885b3652b0f24b  cinnamon-control-center-1.9.0.git7d365d0.tar.gz