The package rpms/cinnamon-settings-daemon.git has added or updated architecture specific
content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cinnamon-settings-daemon.git/comm....
Change:
+%ifnarch s390 s390x %{?rhel:ppc ppc64}
Thanks.
Full change:
============
commit 4d174738805ad8384545c0c4138bad23be70e501
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu May 4 13:39:43 2017 +0100
update to 3.4.0 release
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 753fd07..dc95988 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,20 +1,14 @@
-%global commit 358e90c45e1ad87ad2dc913a2f33e3f32235cd12
-%global date 20170423
-%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
-
-%global cinnamon_desktop_version 3.2.2
+%global cinnamon_desktop_version 3.4.0
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.7%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 1%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
License: GPLv2+ and LGPLv2+
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
+Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0: Port-share-plugin-so-vino-rygel-works.patch.gz
# add hard cinnamon-desktop required version due logind schema
Requires: cinnamon-desktop >= %{cinnamon_desktop_version}
@@ -67,7 +61,7 @@ This package contains libraries and header files for
developing applications that use %{name}.
%prep
-%autosetup -p1 -n %{name}-%{commit}
+%autosetup -p1
NOCONFIGURE=1 ./autogen.sh
%build
@@ -161,6 +155,9 @@ fi
%changelog
+* Wed May 03 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.0-1
+- update to 3.4.0 release
+
* Tue May 02 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.7.20170423git358e90c
- Fix startup delay caused by sharing plugin
diff --git a/csd-background-manager.patch b/csd-background-manager.patch
deleted file mode 100644
index 38a034b..0000000
--- a/csd-background-manager.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/background/csd-background-manager.c
b/plugins/background/csd-background-manager.c
-index c6388e0..fe62f5b 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -137,7 +137,6 @@ settings_change_event_cb (GSettings *settings,
- {
- gnome_bg_load_from_preferences (manager->priv->bg,
- manager->priv->settings);
--
gnome_bg_set_accountsservice_background(gnome_bg_get_filename(manager->priv->bg));
- return FALSE;
- }
-
diff --git a/sources b/sources
index e9d362b..f2641d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-settings-daemon-358e90c45e1ad87ad2dc913a2f33e3f32235cd12.tar.gz) =
290f1913e0f4d455b8a62e9ef2b9bc32348e447bece60afc13c9fa81cdc34e829992e42e3950ad552122cd90db371707dfa00a14efde3657e01d94043db37bd6
+SHA512 (cinnamon-settings-daemon-3.4.0.tar.gz) =
4812c374b74f6e43dc2e5913a396e34c691a581c7174296b99c283ed24a848c093f8c680b476ffe110bfcb11d653b5dbd1df398f8bcd82e62e0c5a527d5eb958
commit d97e0b75c1df47f80ab22f09e3cb548f9619c6d8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 2 09:26:36 2017 +0100
readd patch
diff --git a/Port-share-plugin-so-vino-rygel-works.patch.gz
b/Port-share-plugin-so-vino-rygel-works.patch.gz
new file mode 100644
index 0000000..0983fe9
Binary files /dev/null and b/Port-share-plugin-so-vino-rygel-works.patch.gz differ
commit 28d0635bc9ba7c7ca809404e8f02db28232c2abc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 2 09:20:30 2017 +0100
Fix startup delay caused by sharing plugin
diff --git a/Port-share-plugin-so-vino-rygel-works.patch.gz
b/Port-share-plugin-so-vino-rygel-works.patch.gz
deleted file mode 100644
index 360d8b7..0000000
Binary files a/Port-share-plugin-so-vino-rygel-works.patch.gz and /dev/null differ
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index a0ba3b5..753fd07 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -6,7 +6,7 @@
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.6%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 0.7%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
License: GPLv2+ and LGPLv2+
@@ -161,6 +161,9 @@ fi
%changelog
+* Tue May 02 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.7.20170423git358e90c
+- Fix startup delay caused by sharing plugin
+
* Sun Apr 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.6.20170423git358e90c
- update to git snapshot
commit 1b1e2b64fca8fb4d13e2ef83cf7588edbeb482d5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Apr 23 13:45:46 2017 +0100
update to git snapshot
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 830e518..a0ba3b5 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,12 +1,12 @@
-%global commit f328d98df296847122f96748e8adeef277afe4a1
-%global date 20170420
+%global commit 358e90c45e1ad87ad2dc913a2f33e3f32235cd12
+%global date 20170423
%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
%global cinnamon_desktop_version 3.2.2
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.5%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 0.6%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
License: GPLv2+ and LGPLv2+
@@ -161,6 +161,9 @@ fi
%changelog
+* Sun Apr 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.6.20170423git358e90c
+- update to git snapshot
+
* Fri Apr 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.5.20170420gitf328d98
- revert 'update BR for s390 wacom'
diff --git a/sources b/sources
index c52c34a..e9d362b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-settings-daemon-f328d98df296847122f96748e8adeef277afe4a1.tar.gz) =
9c95dbd8818932d858d86c0dbb6a5961b505fb27c5182b3b2d8dcade7faa38973d453ff053ab5d1be5c6269e21dcf519d30493c390e13f219f079269603365cf
+SHA512 (cinnamon-settings-daemon-358e90c45e1ad87ad2dc913a2f33e3f32235cd12.tar.gz) =
290f1913e0f4d455b8a62e9ef2b9bc32348e447bece60afc13c9fa81cdc34e829992e42e3950ad552122cd90db371707dfa00a14efde3657e01d94043db37bd6
commit 7f311d53d84089f9ee2ca01eb21cc6df25c39920
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Apr 21 15:34:02 2017 +0100
revert 'update BR for s390 wacom
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index c06eaa2..830e518 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -6,7 +6,7 @@
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.4%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 0.5%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
License: GPLv2+ and LGPLv2+
@@ -47,8 +47,10 @@ BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: libxslt
BuildRequires: pkgconfig(librsvg-2.0)
+%ifnarch s390 s390x %{?rhel:ppc ppc64}
BuildRequires: pkgconfig(xorg-wacom)
BuildRequires: pkgconfig(libwacom)
+%endif
%description
A daemon to share settings from CINNAMON to other applications. It also
@@ -139,10 +141,12 @@ fi
%{_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}/cinnamon-settings-daemon/
%{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon*.xml
@@ -157,6 +161,9 @@ fi
%changelog
+* Fri Apr 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.5.20170420gitf328d98
+- revert 'update BR for s390 wacom'
+
* Fri Apr 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.4.20170420gitf328d98
- update to git snapshot
- update BR for s390 wacom
commit fdc1bf6dce6d7b3537fc15fc96c17bfbc19bedc1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Apr 21 15:12:18 2017 +0100
update BR for s390 wacom
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index f1f12ed..c06eaa2 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,4 +1,4 @@
-%global commit 38194418fc7a62652de80140dfb1c521030e402b
+%global commit f328d98df296847122f96748e8adeef277afe4a1
%global date 20170420
%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
@@ -6,7 +6,7 @@
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.3%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 0.4%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
License: GPLv2+ and LGPLv2+
@@ -47,10 +47,8 @@ BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: libxslt
BuildRequires: pkgconfig(librsvg-2.0)
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
BuildRequires: pkgconfig(xorg-wacom)
BuildRequires: pkgconfig(libwacom)
-%endif
%description
A daemon to share settings from CINNAMON to other applications. It also
@@ -141,12 +139,10 @@ fi
%{_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}/cinnamon-settings-daemon/
%{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon*.xml
@@ -161,6 +157,10 @@ fi
%changelog
+* Fri Apr 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.4.20170420gitf328d98
+- update to git snapshot
+- update BR for s390 wacom
+
* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.3.20170420git3819441
- update to git snapshot
diff --git a/sources b/sources
index f33cee7..c52c34a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-settings-daemon-38194418fc7a62652de80140dfb1c521030e402b.tar.gz) =
9d6340dbdc004b28095959304d62d29edc31b6fcebf8cb94d0ee1d52b8218ab5fe9de2f8eb84000903d3e6d010108b14ee8ac99d8b6b07f0dab2f1213b83d24a
+SHA512 (cinnamon-settings-daemon-f328d98df296847122f96748e8adeef277afe4a1.tar.gz) =
9c95dbd8818932d858d86c0dbb6a5961b505fb27c5182b3b2d8dcade7faa38973d453ff053ab5d1be5c6269e21dcf519d30493c390e13f219f079269603365cf
commit 2a0eac507cbd40b09a3eeb9e216555dedbdd96fc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Apr 20 14:00:42 2017 +0100
update to git snapshot
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 9ce31dd..f1f12ed 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,4 +1,4 @@
-%global commit c0cb143f35414dff011b00e0e8eedca1ff290aa8
+%global commit 38194418fc7a62652de80140dfb1c521030e402b
%global date 20170420
%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
@@ -6,7 +6,7 @@
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 0.3%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications
License: GPLv2+ and LGPLv2+
@@ -68,7 +68,6 @@ developing applications that use %{name}.
%prep
%autosetup -p1 -n %{name}-%{commit}
-sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4@g' Makefile.am
NOCONFIGURE=1 ./autogen.sh
%build
@@ -162,6 +161,9 @@ fi
%changelog
+* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.3.20170420git3819441
+- update to git snapshot
+
* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.2.20170420gitc0cb143
- update to git snapshot
- remove gstreamer build requires
diff --git a/sources b/sources
index 4acee5f..f33cee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-settings-daemon-c0cb143f35414dff011b00e0e8eedca1ff290aa8.tar.gz) =
1bb79e604979ea7e017c0545be016f65a9836edb8666b13f0679ae8a7fa1e9a11c955e4e1edda5edc900015140d1f7c9e3d3461d90fdfbf1ed61e7b73314cfd1
+SHA512 (cinnamon-settings-daemon-38194418fc7a62652de80140dfb1c521030e402b.tar.gz) =
9d6340dbdc004b28095959304d62d29edc31b6fcebf8cb94d0ee1d52b8218ab5fe9de2f8eb84000903d3e6d010108b14ee8ac99d8b6b07f0dab2f1213b83d24a
commit 18851ea3d7a3af0921c7efb022bd86e6cd453a34
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Apr 20 12:05:56 2017 +0100
update to git snapshot
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 897e50c..9ce31dd 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,5 +1,5 @@
-%global commit 494e44891290c9a74e344c494cc7c2609aa58302
-%global date 20170419
+%global commit c0cb143f35414dff011b00e0e8eedca1ff290aa8
+%global date 20170420
%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
%global cinnamon_desktop_version 3.2.2
@@ -68,12 +68,12 @@ developing applications that use %{name}.
%prep
%autosetup -p1 -n %{name}-%{commit}
+sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4@g' Makefile.am
NOCONFIGURE=1 ./autogen.sh
%build
%configure --disable-static \
- --enable-profiling \
- --enable-systemd
+ --enable-profiling
%make_build V=1
@@ -162,7 +162,8 @@ fi
%changelog
-* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.2.20170419git494e448
+* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.2.20170420gitc0cb143
+- update to git snapshot
- remove gstreamer build requires
- spec file clean up
diff --git a/sources b/sources
index b11a09c..4acee5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-settings-daemon-494e44891290c9a74e344c494cc7c2609aa58302.tar.gz) =
baf3be576202b6f7db17abfd59c8b409ba54882d020bdcf4550111f57b62946f2afbd6355dc53d474f3d84424ad388de82d8c631d0efebdd08d8979dd7017705
+SHA512 (cinnamon-settings-daemon-c0cb143f35414dff011b00e0e8eedca1ff290aa8.tar.gz) =
1bb79e604979ea7e017c0545be016f65a9836edb8666b13f0679ae8a7fa1e9a11c955e4e1edda5edc900015140d1f7c9e3d3461d90fdfbf1ed61e7b73314cfd1
commit 9bc24d12ac5fa273938f1453bd8500cf2e048297
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Apr 20 10:57:23 2017 +0100
clean up
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index d63a373..897e50c 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -6,13 +6,12 @@
Name: cinnamon-settings-daemon
Version: 3.4.0
-Release: 0.1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 0.2%{?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:
https://github.com/linuxmint/
-#Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+#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
@@ -21,12 +20,10 @@ Patch1: Port-share-plugin-so-vino-rygel-works.patch.gz
Requires: cinnamon-desktop >= %{cinnamon_desktop_version}
Requires: cinnamon-control-center-filesystem
Requires: iio-sensor-proxy
-Obsoletes: cinnamon-settings-daemon-updates
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(cinnamon-desktop) >= %{cinnamon_desktop_version}
BuildRequires: pkgconfig(xxf86misc)
-BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libgnomekbd)
BuildRequires: pkgconfig(libnm-glib)
@@ -61,7 +58,6 @@ handles global keybindings, and many of desktop-wide settings.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: dbus-glib-devel
@@ -72,9 +68,6 @@ developing applications that use %{name}.
%prep
%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
NOCONFIGURE=1 ./autogen.sh
%build
@@ -96,6 +89,9 @@ ln -s %{_libexecdir}/cinnamon-settings-daemon
$RPM_BUILD_ROOT%{_bindir}/cinnamon
desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/*
+
+# Fix non-executable script
+chmod a+x
$RPM_BUILD_ROOT%{_datadir}/cinnamon-settings-daemon-3.0/input-device-example.sh
%find_lang %{name} --with-gnome
@@ -117,7 +113,7 @@ fi
%doc AUTHORS
%license COPYING COPYING.LIB
%config
%{_sysconfdir}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
-%{_sysconfdir}/xdg/autostart/*
+%config %{_sysconfdir}/xdg/autostart/*
%{_bindir}/cinnamon-settings-daemon
%{_libdir}/cinnamon-settings-daemon-3.0/
%{_libexecdir}/csd-a11y-keyboard
@@ -166,6 +162,10 @@ fi
%changelog
+* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.2.20170419git494e448
+- remove gstreamer build requires
+- spec file clean up
+
* Wed Apr 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.1.20170419git494e448
- update to git snapshot
commit 8af5b260f24af1c5869aa3aa57b60d09d6e0d2e4
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Apr 19 23:10:08 2017 +0100
update to git snapshot
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index ae1369c..d63a373 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,4 +1,4 @@
-%global commit 5f19598fad9f28ee39f40525e55e5749ecb72109
+%global commit 494e44891290c9a74e344c494cc7c2609aa58302
%global date 20170419
%global shortcommit0 %(c=%{commit}; echo ${c:0:7})
@@ -16,8 +16,6 @@ URL:
https://github.com/linuxmint/
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}
@@ -168,7 +166,7 @@ fi
%changelog
-* Wed Apr 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.1.20170419git5f19598
+* Wed Apr 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.1.20170419git494e448
- update to git snapshot
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.1-2
diff --git a/sources b/sources
index ef7d4ac..b11a09c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-settings-daemon-5f19598fad9f28ee39f40525e55e5749ecb72109.tar.gz) =
43607152113af8e0d5344865e556491ee4d8e82eb735db868cf03ac709e8abd9cd7fc927ea5acde89b5f2638b1bb02f6b8c0a7fbee7d8e7bbac1d68c589bab75
+SHA512 (cinnamon-settings-daemon-494e44891290c9a74e344c494cc7c2609aa58302.tar.gz) =
baf3be576202b6f7db17abfd59c8b409ba54882d020bdcf4550111f57b62946f2afbd6355dc53d474f3d84424ad388de82d8c631d0efebdd08d8979dd7017705
commit e502b78374b35a5014aebfbb7190101798f39563
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Apr 19 23:06:57 2017 +0100
update to git snapshot
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}-%...
+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 <leigh123linux(a)googlemail.com> -
3.4.0-0.1.20170419git5f19598
+- update to git snapshot
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 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