- updated to 4.6.0

- removed obsolete restore_old_logind_check patch
- include locales

diff --git a/cinnamon-settings-daemon-restore_old_logind_check.patch b/cinnamon-settings-daemon-restore_old_logind_check.patch
deleted file mode 100644 (file)
index 90b6373..0000000
--- a/cinnamon-settings-daemon-restore_old_logind_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Wed, 11 Dec 2019 23:29:08 +0000
-Subject: [PATCH] Restore old check for logind
-
----
- cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +-
- plugins/common/csd-power-helper.c                    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c
-index adbe1e7..4d52b21 100644
---- a/cinnamon-settings-daemon/cinnamon-settings-session.c
-+++ b/cinnamon-settings-daemon/cinnamon-settings-session.c
-@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session)
-       session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session);
- 
- #ifdef HAVE_LOGIND
--    if (access("/run/systemd/system/", F_OK) == 0) {    // sd_booted ()
-+    if (access("/run/systemd/seats/", F_OK) == 0) {    // sd_booted ()
-         sd_pid_get_session (getpid(), &session->priv->session_id);
-         session->priv->sd_source = sd_source_new ();
-         g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c
-index 5a83072..82c0b22 100644
---- a/plugins/common/csd-power-helper.c
-+++ b/plugins/common/csd-power-helper.c
-@@ -41,7 +41,7 @@ use_logind (void)
-     static gsize once_init_value = 0;
- 
-     if (g_once_init_enter (&once_init_value)) {
--        should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted ()
-+        should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted ()
- 
-         g_once_init_leave (&once_init_value, 1);
-     }

diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 19d0d4da0801b45c855a19358f5a10c9102c4ca7..6dcfb106ac1ddb2ed76007dd91b745acb773f236 100644 (file)
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,17 +1,18 @@
-%define        cinnamon_desktop_ver    4.4.0
+%define        cinnamon_desktop_ver    4.6.0
 
 Summary:       Collection of Cinnamon settings plugins
 Summary(pl.UTF-8):     Zbiór wtyczek do ustawień środowiska Cinnamon
 Name:          cinnamon-settings-daemon
-Version:       4.4.0
+Version:       4.6.0
 Release:       1
 License:       GPL v2+
 Group:         Applications
 #Source0Download: https://github.com/linuxmint/cinnamon-settings-daemon/releases
 Source0:       https://github.com/linuxmint/cinnamon-settings-daemon/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 51060a85e4922588f8ba5e120e79fcd2
-# https://github.com/linuxmint/cinnamon-settings-daemon/commit/4c19a41429524a2da202b919a335a646103da0fd.patch
-Patch0:                %{name}-restore_old_logind_check.patch
+# Source0-md5: 9b89da1d98f57f55d264ebb3d205b88d
+#Source1Download: https://github.com/linuxmint/cinnamon-translations/releases
+Source1:       https://github.com/linuxmint/cinnamon-translations/archive/%{version}/cinnamon-translations-%{version}.tar.gz
+# Source1-md5: 2a7f336ad50c2ec8ec4e80a7acf5f899
 URL:           https://github.com/linuxmint/cinnamon-settings-daemon
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
@@ -20,7 +21,6 @@ BuildRequires:        colord-devel >= 0.1.27
 BuildRequires: cups-devel >= 1.4
 BuildRequires: dbus-devel >= 1.1.2
 BuildRequires: dbus-glib-devel
-#BuildRequires:        desktop-file-utils
 BuildRequires: fontconfig-devel
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.38.0
@@ -96,8 +96,7 @@ Development files for Cinnamon settings daemon.
 Pliki programistyczne demona ustawień środowiska Cinnamon.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a1
 
 %build
 install -d m4
@@ -114,6 +113,8 @@ install -d m4
 
 %{__make}
 
+%{__make} -C cinnamon-translations-%{version}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -125,13 +126,23 @@ rm -rf $RPM_BUILD_ROOT
 # example script, packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/cinnamon-settings-daemon-3.0/input-device-example.sh
 
+cd cinnamon-translations-%{version}
+for f in usr/share/locale/*/LC_MESSAGES/%{name}.mo ; do
+       install -D "$f" "$RPM_BUILD_ROOT/$f"
+done
+cd ..
+
+# not supported by glibc
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS MAINTAINERS README.rst plugins/common/input-device-example.sh
-%dir %{_libdir}/cinnamon-settings-daemon-3.0/
 %attr(755,root,root) %{_libexecdir}/csd-a11y-keyboard
 %attr(755,root,root) %{_libexecdir}/csd-a11y-settings
 %attr(755,root,root) %{_libexecdir}/csd-automount
@@ -163,8 +174,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/csd-wacom-led-helper
 %attr(755,root,root) %{_libexecdir}/csd-wacom-osd
 %endif
+%dir %{_libdir}/cinnamon-settings-daemon-3.0
 %attr(755,root,root) %{_libdir}/cinnamon-settings-daemon-3.0/libcsd.so
-%config /etc/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
 %{_sysconfdir}/xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop
 %{_sysconfdir}/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop
 %{_sysconfdir}/xdg/autostart/cinnamon-settings-daemon-automount.desktop
@@ -187,6 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/xdg/autostart/cinnamon-settings-daemon-xsettings.desktop
 %{_datadir}/cinnamon-settings-daemon
 %{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
+%{_datadir}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
 %{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.enums.xml
 %{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.*.gschema.xml
 %{_datadir}/polkit-1/actions/org.cinnamon.settings*.policy