diff --git a/Port-share-plugin-so-vino-rygel-works.patch.gz b/Port-share-plugin-so-vino-rygel-works.patch.gz index 77fc840..360d8b7 100644 Binary files a/Port-share-plugin-so-vino-rygel-works.patch.gz and b/Port-share-plugin-so-vino-rygel-works.patch.gz differ diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index 03477c2..ae1369c 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -1,16 +1,23 @@ +%global commit 5f19598fad9f28ee39f40525e55e5749ecb72109 +%global date 20170419 +%global shortcommit0 %(c=%{commit}; echo ${c:0:7}) + %global cinnamon_desktop_version 3.2.2 Name: cinnamon-settings-daemon -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.4.0 +Release: 0.1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications Group: System Environment/Daemons License: GPLv2+ and LGPLv2+ -URL: http://cinnamon.linuxmint.com -Source0: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: https://github.com/linuxmint/ +#Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %url/%{name}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz Patch0: csd-background-manager.patch Patch1: Port-share-plugin-so-vino-rygel-works.patch.gz +# https://github.com/linuxmint/cinnamon-settings-daemon/pull/163 +Patch2: 163.patch # add hard cinnamon-desktop required version due logind schema Requires: cinnamon-desktop >= %{cinnamon_desktop_version} @@ -66,7 +73,7 @@ This package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{commit} sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4@g' Makefile.am echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac @@ -89,8 +96,8 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}/ ln -s %{_libexecdir}/cinnamon-settings-daemon $RPM_BUILD_ROOT%{_bindir}/cinnamon-settings-daemon desktop-file-install --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/* + --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ \ + $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/* %find_lang %{name} --with-gnome @@ -102,45 +109,68 @@ desktop-file-install --delete-original \ if [ $1 -eq 0 ]; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files -f %{name}.lang %doc AUTHORS %license COPYING COPYING.LIB %config %{_sysconfdir}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf +%{_sysconfdir}/xdg/autostart/* %{_bindir}/cinnamon-settings-daemon %{_libdir}/cinnamon-settings-daemon-3.0/ -%{_libexecdir}/cinnamon-settings-daemon +%{_libexecdir}/csd-a11y-keyboard +%{_libexecdir}/csd-a11y-settings +%{_libexecdir}/csd-automount +%{_libexecdir}/csd-background %{_libexecdir}/csd-backlight-helper +%{_libexecdir}/csd-clipboard +%{_libexecdir}/csd-color +%{_libexecdir}/csd-cursor %{_libexecdir}/csd-datetime-mechanism +%{_libexecdir}/csd-dummy +%{_libexecdir}/csd-housekeeping +%{_libexecdir}/csd-input-helper +%{_libexecdir}/csd-keyboard %{_libexecdir}/csd-locate-pointer +%{_libexecdir}/csd-media-keys +%{_libexecdir}/csd-mouse +%{_libexecdir}/csd-orientation +%{_libexecdir}/csd-power %{_libexecdir}/csd-printer +%{_libexecdir}/csd-print-notifications +%{_libexecdir}/csd-screensaver-proxy +%{_libexecdir}/csd-sharing +%{_libexecdir}/csd-smartcard +%{_libexecdir}/csd-sound +%{_libexecdir}/csd-xrandr +%{_libexecdir}/csd-xsettings %ifnarch s390 s390x %{?rhel:ppc ppc64} %{_libexecdir}/csd-list-wacom +%{_libexecdir}/csd-wacom %{_libexecdir}/csd-wacom-led-helper +%{_libexecdir}/csd-wacom-osd %endif -%{_datadir}/applications/cinnamon-settings-daemon.desktop %{_datadir}/cinnamon-settings-daemon/ %{_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}/icons/hicolor/*/apps/csd-* %{_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/ %changelog +* Wed Apr 19 2017 Leigh Scott - 3.4.0-0.1.20170419git5f19598 +- update to git snapshot + * Fri Feb 10 2017 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 851f504..ef7d4ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-settings-daemon-3.2.1.tar.gz) = ccc967b141e362e991b1f712b5ac5d2aed234548fe266e66a06b0be4b3edd73474e0078b25154228a52d7b09d93670fc82dbb0ef5532eb6ccf034a91b65c7f6e +SHA512 (cinnamon-settings-daemon-5f19598fad9f28ee39f40525e55e5749ecb72109.tar.gz) = 43607152113af8e0d5344865e556491ee4d8e82eb735db868cf03ac709e8abd9cd7fc927ea5acde89b5f2638b1bb02f6b8c0a7fbee7d8e7bbac1d68c589bab75