From 4b7cf5bc3dd34a8e5e2033de5023bd1ce862d6f0 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Feb 15 2018 14:43:38 +0000 Subject: update to git snapshot --- diff --git a/.gitignore b/.gitignore index 95a4a27..198fc0a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cinnamon-3.6.5.tar.gz /cinnamon-3.6.6.tar.gz /cinnamon-3.6.7.tar.gz +/cinnamon-4b2bc058c981fec14486924e4b566d74f1723821.tar.gz diff --git a/cinnamon.spec b/cinnamon.spec index 32c2039..2b6dc6f 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,7 +1,11 @@ +%global commit 4b2bc058c981fec14486924e4b566d74f1723821 +%global date 20180209 +%global shortcommit0 %(c=%{commit}; echo ${c:0:7}) + %global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so %global clutter_version 1.12.2 -%global cjs_version 3.6.0 +%global cjs_version 3.6.1 %global cinnamon_desktop_version 3.6.0 %global gobject_introspection_version 1.38.0 %global muffin_version 3.6.0 @@ -13,12 +17,12 @@ Name: cinnamon -Version: 3.6.7 -Release: 5%{?dist} +Version: 3.6.8 +Release: 0.1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} -Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz Source1: polkit-%{name}-authentication-agent-1.desktop Source2: 10_cinnamon-common.gschema.override Source3: 10_cinnamon-apps.gschema.override.in @@ -204,7 +208,7 @@ This package contains the code documentation for various Cinnamon components. %prep -%autosetup -p1 -n Cinnamon-%{version} +%autosetup -p1 -n Cinnamon-%{commit} %{__sed} -i -e 's@gksu@pkexec@g' files%{_bindir}/%{name}-settings-users %{__sed} -i -e 's@gnome-orca@orca@g' files%{_datadir}/%{name}/%{name}-settings/modules/cs_accessibility.py @@ -330,6 +334,9 @@ fi %changelog +* Thu Feb 15 2018 Leigh Scott - 3.6.8-0.1.20180209git4b2bc05 +- update to git snapshot + * Wed Feb 07 2018 Fedora Release Engineering - 3.6.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/revert_25aef37.patch b/revert_25aef37.patch index 9a2c883..5fdfe67 100644 --- a/revert_25aef37.patch +++ b/revert_25aef37.patch @@ -2,8 +2,8 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- =================================================================== --- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -53,10 +53,9 @@ class GroupDialog (Gtk.Dialog): - print detail +@@ -53,10 +53,9 @@ + print(detail) def _on_entry_changed(self, entry): - name = entry.get_text() @@ -15,7 +15,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- self.set_response_sensitive(Gtk.ResponseType.OK, False) else: entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None) -@@ -359,9 +358,9 @@ class NewUserDialog(Gtk.Dialog): +@@ -367,9 +366,9 @@ fullname = self.realname_entry.get_text() username = self.username_entry.get_text() valid = True @@ -27,3 +27,4 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- valid = False else: self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None) + diff --git a/set_wheel.patch b/set_wheel.patch index 8981092..32dae07 100644 --- a/set_wheel.patch +++ b/set_wheel.patch @@ -2,7 +2,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- =================================================================== --- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -153,12 +153,11 @@ class EditableEntry (Gtk.Notebook): +@@ -153,12 +153,11 @@ class PasswordDialog(Gtk.Dialog): @@ -16,7 +16,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- self.set_modal(True) self.set_skip_taskbar_hint(True) -@@ -224,14 +223,7 @@ class PasswordDialog(Gtk.Dialog): +@@ -224,14 +223,7 @@ def change_password(self): newpass = self.new_password.get_text() self.user.set_password(newpass, "") @@ -27,12 +27,12 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- - mask.remove("nopasswdlogin") - mask = ", ".join(mask) - self.group_mask.set_text(mask) -- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') +- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') + self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') self.destroy() def set_passwords_visibility(self): -@@ -570,7 +562,7 @@ class Module: +@@ -570,7 +562,7 @@ model, treeiter = self.users_treeview.get_selection().get_selected() if treeiter != None: user = model[treeiter][INDEX_USER_OBJECT] @@ -41,7 +41,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- response = dialog.run() def _on_groups_button_clicked(self, widget): -@@ -839,11 +831,11 @@ class Module: +@@ -839,11 +831,11 @@ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) description = "%s\n%s" % (fullname, username) piter = self.users.append(None, [new_user, pixbuf, description]) @@ -56,3 +56,4 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- self.load_groups() dialog.destroy() + diff --git a/sources b/sources index 4f2c825..ac013f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-3.6.7.tar.gz) = 446e0bbf1fcda7e193735115b4c0396e24428e102b0e74d4b1e150c279d97bbf45961fe57ac08e5828f957c390c39bf385bf29ae7549f5fead2bc59389e64add +SHA512 (cinnamon-4b2bc058c981fec14486924e4b566d74f1723821.tar.gz) = 8a7e4e5de3484dc253f41162b15e9f3af5c9e2c8591d7e3ee1f7103327cc34d6f529361a87bb9d52976013760e76a3039c75feabc3df367d8d5541c172115c51