[cinnamon-settings-daemon] update to 2.0.2
leigh123linux
leigh123linux at fedoraproject.org
Fri Oct 18 15:58:04 UTC 2013
commit 88a5c1ea0b53c47b20a43d2deedfacaf4cf1a03a
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Fri Oct 18 16:57:54 2013 +0100
update to 2.0.2
.gitignore | 1 +
cinnamon-settings-daemon.spec | 139 +++++++----------------------------------
sources | 2 +-
3 files changed, 25 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4034dd3..02e415b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/cinnamon-settings-daemon-1.0.0.gitcb4d724.tar.gz
/cinnamon-settings-daemon-1.9.1.tar.gz
/cinnamon-settings-daemon-2.0.1.tar.gz
+/cinnamon-settings-daemon-2.0.2.tar.gz
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 1209ab7..a7260f8 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,8 +1,8 @@
-%global _internal_version cb4d724
+#global _internal_version cb4d724
Name: cinnamon-settings-daemon
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
Group: System Environment/Daemons
@@ -35,6 +35,7 @@ BuildRequires: pkgconfig(libsystemd-login)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(ibus-1.0)
BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl
BuildRequires: gnome-common
BuildRequires: intltool
@@ -74,10 +75,9 @@ make V=1 %{?_smp_mflags}
%make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-cp $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/cinnamon-fallback-mount-helper.desktop \
-$RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/cinnamon2d-fallback-mount-helper.desktop
-sed -i -e '124iAutostartCondition=GNOME3 if-session cinnamon' $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/cinnamon-fallback-mount-helper.desktop
-sed -i -e '124iAutostartCondition=GNOME3 if-session cinnamon2d' $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/cinnamon2d-fallback-mount-helper.desktop
+desktop-file-install --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/*
%find_lang %{name} --with-gnome
@@ -99,129 +99,36 @@ fi
%files -f %{name}.lang
%doc AUTHORS COPYING
-%dir %{_sysconfdir}/cinnamon-settings-daemon
-%dir %{_sysconfdir}/cinnamon-settings-daemon/xrandr
-
-# list plugins explicitly, so we notice if one goes missing
-# some of these don't have a separate gschema
-%dir %{_libdir}/cinnamon-settings-daemon-3.0
-%{_libdir}/cinnamon-settings-daemon-3.0/a11y-keyboard.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/liba11y-keyboard.so
-
-# The automount plugin is a separate executable used in fallback
-# mode only
+%config %{_sysconfdir}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
+%{_libdir}/cinnamon-settings-daemon-3.0/
%{_libexecdir}/cinnamon-fallback-mount-helper
-%config %{_sysconfdir}/xdg/autostart/cinnamon-fallback-mount-helper.desktop
-%config %{_sysconfdir}/xdg/autostart/cinnamon2d-fallback-mount-helper.desktop
-
-%{_libdir}/cinnamon-settings-daemon-3.0/background.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libbackground.so
-
-%{_libdir}/cinnamon-settings-daemon-3.0/clipboard.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libclipboard.so
-
+%{_libexecdir}/cinnamon-settings-daemon
+%{_libexecdir}/csd-backlight-helper
%{_libexecdir}/csd-datetime-mechanism
-%config %{_sysconfdir}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
-%{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
-%{_datadir}/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
-
-%{_libdir}/cinnamon-settings-daemon-3.0/housekeeping.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libhousekeeping.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.housekeeping.gschema.xml
-
%{_libexecdir}/csd-input-sources-switcher
-%{_libexecdir}/csd-test-keyboard
-%{_libdir}/cinnamon-settings-daemon-3.0/keyboard.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libkeyboard.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.keyboard.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/media-keys.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libmedia-keys.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/mouse.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libmouse.so
-
-%{_libexecdir}/csd-backlight-helper
-%{_datadir}/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy
-%{_libdir}/cinnamon-settings-daemon-3.0/power.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libpower.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.power.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/print-notifications.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libprint-notifications.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.print-notifications.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/smartcard.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libsmartcard.so
-
-%{_libdir}/cinnamon-settings-daemon-3.0/sound.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libsound.so
-
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.peripherals.gschema.xml
-
-
-%{_libdir}/cinnamon-settings-daemon-3.0/xrandr.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libxrandr.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/xsettings.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libxsettings.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/a11y-settings.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/liba11y-settings.so
-
-%{_libdir}/cinnamon-settings-daemon-3.0/color.cinnamon-settings-plugin
-%{_libdir}/cinnamon-settings-daemon-3.0/libcolor.so
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.color.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/liborientation.so
-%{_libdir}/cinnamon-settings-daemon-3.0/orientation.cinnamon-settings-plugin
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.orientation.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/libcursor.so
-%{_libdir}/cinnamon-settings-daemon-3.0/cursor.cinnamon-settings-plugin
-
-%{_libdir}/cinnamon-settings-daemon-3.0/libscreensaver-proxy.so
-%{_libdir}/cinnamon-settings-daemon-3.0/screensaver-proxy.cinnamon-settings-plugin
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.background.gschema.xml
-
-%{_libdir}/cinnamon-settings-daemon-3.0/libcsd.so
-
-%{_libexecdir}/cinnamon-settings-daemon
%{_libexecdir}/csd-locate-pointer
%{_libexecdir}/csd-printer
-
+%{_datadir}/applications/cinnamon-fallback-mount-helper.desktop
+%{_datadir}/applications/cinnamon-settings-daemon.desktop
%{_datadir}/cinnamon-settings-daemon/
-%config %{_sysconfdir}/xdg/autostart/cinnamon-settings-daemon.desktop
+%{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
+%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon*.xml
%{_datadir}/icons/hicolor/*/apps/csd-xrandr.*
-
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.enums.xml
-%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.gschema.xml
-
-%{_datadir}/man/man1/cinnamon-settings-daemon.1.*
-
+%{_datadir}/polkit-1/actions/org.cinnamon.settings*.policy
+%{_mandir}/man1/cinnamon-settings-daemon.1.*
%files devel
%{_includedir}/cinnamon-settings-daemon-3.0/
%{_libdir}/pkgconfig/cinnamon-settings-daemon.pc
+%{_libexecdir}/csd-test-*
%{_datadir}/cinnamon-settings-daemon-3.0/
-%{_libexecdir}/csd-test-a11y-keyboard
-%{_libexecdir}/csd-test-a11y-settings
-%{_libexecdir}/csd-test-background
-%{_libexecdir}/csd-test-input-helper
-%{_libexecdir}/csd-test-media-keys
-%{_libexecdir}/csd-test-mouse
-%{_libexecdir}/csd-test-orientation
-%{_libexecdir}/csd-test-power
-%{_libexecdir}/csd-test-print-notifications
-%{_libexecdir}/csd-test-screensaver-proxy
-%{_libexecdir}/csd-test-smartcard
-%{_libexecdir}/csd-test-sound
-%{_libexecdir}/csd-test-xsettings
+
%changelog
+* Fri Oct 18 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
+- update to 2.0.2
+- sort out files section
+
* Thu Oct 17 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.1-2
- Stop cinnamon-fallback-mount-helper starting in gnome-shell
diff --git a/sources b/sources
index 2676925..9655ed3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd3bb7b100d433c3d8755695e5381f17 cinnamon-settings-daemon-2.0.1.tar.gz
+540479237f5e6928a2a0a7448b4f0c35 cinnamon-settings-daemon-2.0.2.tar.gz
More information about the scm-commits
mailing list