diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec index 8ba114a..23201fc 100644 --- a/cinnamon-desktop.spec +++ b/cinnamon-desktop.spec @@ -1,7 +1,3 @@ -%global commit 75d297afd502186c94473341000012e51b2aec69 -%global date 20170421 -%global shortcommit0 %(c=%{commit}; echo ${c:0:7}) - %global gtk3_version 3.10.0 %global glib2_version 2.37.3 %global startup_notification_version 0.5 @@ -11,16 +7,14 @@ Summary: Shared code among cinnamon-session, nemo, etc Name: cinnamon-desktop Version: 3.4.0 -Release: 0.2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ and MIT 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 +Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: x-cinnamon-mimeapps.list Patch0: set_font_defaults.patch Patch1: set_logind.patch -Patch2: gnome-bg.patch Requires: redhat-menus @@ -38,6 +32,7 @@ BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(gtk-doc) >= %{gtk_doc_version} BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(accountsservice) BuildRequires: gnome-common BuildRequires: intltool BuildRequires: itstool @@ -63,7 +58,7 @@ Libraries and header files for the CINNAMON-internal private library libcinnamon-desktop. %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 NOCONFIGURE=1 ./autogen.sh %build @@ -103,6 +98,9 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/x-cinnamon-mimea %{_datadir}/gir-1.0/C*.gir %changelog +* Wed May 03 2017 Leigh Scott - 3.4.0-1 +- update to 3.4.0 release + * Tue May 02 2017 Leigh Scott - 3.4.0-0.2.20170421git75d297a - remove requires xorg-x11-drv-libinput diff --git a/gnome-bg.patch b/gnome-bg.patch deleted file mode 100644 index 435babe..0000000 --- a/gnome-bg.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/libcinnamon-desktop/gnome-bg.c b/libcinnamon-desktop/gnome-bg.c -index fb0c46a..2716d4f 100644 ---- a/libcinnamon-desktop/gnome-bg.c -+++ b/libcinnamon-desktop/gnome-bg.c -@@ -325,87 +325,6 @@ bg_gsettings_mapping (GVariant *value, - } - - void --gnome_bg_set_accountsservice_background (const gchar *background) --{ -- GDBusProxy *proxy = NULL; -- GDBusProxy *user = NULL; -- GVariant *variant = NULL; -- GError *error = NULL; -- gchar *object_path = NULL; -- -- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.Accounts", -- "/org/freedesktop/Accounts", -- "org.freedesktop.Accounts", -- NULL, -- &error); -- -- if (proxy == NULL) { -- g_warning ("Failed to contact accounts service: %s", error->message); -- g_error_free (error); -- return; -- } -- -- variant = g_dbus_proxy_call_sync (proxy, -- "FindUserByName", -- g_variant_new ("(s)", g_get_user_name ()), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- NULL, -- &error); -- -- if (variant == NULL) { -- g_warning ("Could not contact accounts service to look up '%s': %s", -- g_get_user_name (), error->message); -- g_error_free (error); -- goto bail; -- } -- -- g_variant_get (variant, "(o)", &object_path); -- user = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.Accounts", -- object_path, -- "org.freedesktop.Accounts.User", -- NULL, -- &error); -- g_free (object_path); -- -- if (user == NULL) { -- g_warning ("Could not create proxy for user '%s': %s", -- g_variant_get_string (variant, NULL), error->message); -- g_error_free (error); -- goto bail; -- } -- g_variant_unref (variant); -- -- variant = g_dbus_proxy_call_sync (user, -- "SetBackgroundFile", -- g_variant_new ("(s)", background ? background : ""), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- NULL, -- &error); -- -- if (variant == NULL) { -- g_warning ("Failed to set the background '%s': %s", background, error->message); -- g_error_free (error); -- goto bail; -- } -- --bail: -- if (proxy != NULL) -- g_object_unref (proxy); -- if (user != NULL) -- g_object_unref (user); -- if (variant != NULL) -- g_variant_unref (variant); --} -- --void - gnome_bg_load_from_preferences (GnomeBG *bg, - GSettings *settings) - { diff --git a/sources b/sources index 01bdec8..11b6e11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-desktop-75d297afd502186c94473341000012e51b2aec69.tar.gz) = 341c6bc42b377b1a26ace365076620759771ca48cac8631ea1b0497c4f0249cf60f61adeffd8f652eca772af8130b59ea9b3f7546db825e9ebd913da5d74779e +SHA512 (cinnamon-desktop-3.4.0.tar.gz) = 4e07d026c4da0e5a57796c355ae03449aee431a3899a77cb4154b3772cee7669a3aefa2133d636a9d1655be41efb227d52b3b53ae355e172cfc0ecb599a9b319