The package rpms/cinnamon.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.git/commit/?id=2b3b7e968....
Change:
+%ifarch ppc64
Thanks.
Full change:
============
commit 2b3b7e968e3719d63d966fb65b379b15adcd4630
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Nov 6 22:32:41 2018 +0000
Revert "Not enough time to maintain"
This reverts commit 89048d952c2489bd99df93d7d5df77b3b3435e20.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b2a1960
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,32 @@
+/Cinnamon-*.tar.gz
+/cinnamon-*.src.rpmz
+/cinnamon-886147d6ac2197b87290556a96efdf41cce27835.tar.gz
+/cinnamon-067e1dabe369ceb72de7558b1d63af826f748f8a.tar.gz
+/cinnamon-3.4.0.tar.gz
+/cinnamon-3.4.1.tar.gz
+/cinnamon-3.4.2.tar.gz
+/cinnamon-3.4.4.tar.gz
+/cinnamon-3.4.6.tar.gz
+/cinnamon-3.6.0.tar.gz
+/cinnamon-3.6.2.tar.gz
+/cinnamon-3.6.3.tar.gz
+/cinnamon-3.6.4.tar.gz
+/cinnamon-3.6.5.tar.gz
+/cinnamon-3.6.6.tar.gz
+/cinnamon-3.6.7.tar.gz
+/cinnamon-4b2bc058c981fec14486924e4b566d74f1723821.tar.gz
+/cinnamon-9a0ffdb578c747c1f8b34eaf98ce7406c4ec9d90.tar.gz
+/cinnamon-aee5bb1ff17baf95c43f408b0f0258845ffcd1db.tar.gz
+/cinnamon-d4679f7c39111e325cadff68d6a2da0528332e8f.tar.gz
+/cinnamon-d7e0764091b896841ebb2dc005a4e120ce145e91.tar.gz
+/cinnamon-45339e811a694e101467a9cf6fcdd7fa6d82c899.tar.gz
+/cinnamon-826221011af2da7e77c63f80cfaf2f262dd5184e.tar.gz
+/cinnamon-3.8.0.tar.gz
+/cinnamon-3.8.1.tar.gz
+/cinnamon-3.8.2.tar.gz
+/cinnamon-3.8.3.tar.gz
+/cinnamon-3.8.4.tar.gz
+/cinnamon-3.8.7.tar.gz
+/cinnamon-3.8.8.tar.gz
+/cinnamon-3.8.9.tar.gz
+/cinnamon-4.0.0.tar.gz
diff --git a/10_cinnamon-apps.gschema.override.in b/10_cinnamon-apps.gschema.override.in
new file mode 100644
index 0000000..c2b4fa6
--- /dev/null
+++ b/10_cinnamon-apps.gschema.override.in
@@ -0,0 +1,2 @@
+[org.cinnamon]
+favorite-apps=['firefox.desktop', '@pkg_manager@',
'cinnamon-settings.desktop', 'org.gnome.Terminal.desktop',
'nemo.desktop']
diff --git a/10_cinnamon-common.gschema.override b/10_cinnamon-common.gschema.override
new file mode 100644
index 0000000..283b2fd
--- /dev/null
+++ b/10_cinnamon-common.gschema.override
@@ -0,0 +1,77 @@
+[org.cinnamon]
+desktop-effects-minimize-effect='traditional'
+number-workspaces=4
+startup-animation=true
+workspace-expo-view-as-grid=true
+enable-indicators=false
+enabled-applets=['panel1:right:0:systray@cinnamon.org',
'panel1:left:0:menu@cinnamon.org',
'panel1:left:1:show-desktop@cinnamon.org',
'panel1:left:2:panel-launchers@cinnamon.org',
'panel1:left:3:window-list@cinnamon.org',
'panel1:right:1:keyboard@cinnamon.org',
'panel1:right:2:notifications@cinnamon.org',
'panel1:right:3:removable-drives@cinnamon.org',
'panel1:right:4:user@cinnamon.org', 'panel1:right:5:network@cinnamon.org',
'panel1:right:6:blueberry@cinnamon.org',
'panel1:right:7:power@cinnamon.org',
'panel1:right:8:calendar@cinnamon.org',
'panel1:right:9:sound@cinnamon.org']
+
+[org.cinnamon.sounds]
+login-enabled=true
+login-file='/usr/share/cinnamon-control-center/sounds/login.oga'
+logout-enabled=true
+logout-file='/usr/share/cinnamon-control-center/sounds/logout.ogg'
+switch-enabled=true
+switch-file='/usr/share/cinnamon-control-center/sounds/switch.oga'
+close-enabled=true
+close-file='/usr/share/cinnamon-control-center/sounds/close.oga'
+map-enabled=true
+map-file='/usr/share/cinnamon-control-center/sounds/map.oga'
+minimize-enabled=true
+minimize-file='/usr/share/cinnamon-control-center/sounds/minimize.oga'
+maximize-enabled=true
+maximize-file='/usr/share/cinnamon-control-center/sounds/maximize.oga'
+unmaximize-enabled=true
+unmaximize-file='/usr/share/cinnamon-control-center/sounds/unmaximize.oga'
+tile-enabled=true
+tile-file='/usr/share/cinnamon-control-center/sounds/tile.oga'
+plug-enabled=true
+plug-file='/usr/share/cinnamon-control-center/sounds/plug.oga'
+unplug-enabled=true
+unplug-file='/usr/share/cinnamon-control-center/sounds/unplug.oga'
+
+[org.cinnamon.desktop.sound]
+event-sounds=true
+input-feedback-sounds=false
+volume-sound-enabled=true
+volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
+
+[org.cinnamon.desktop.screensaver]
+ask-for-away-message=false
+font-date='Noto Sans 24'
+font-message='Noto Sans 14'
+show-clock=true
+font-time='Noto Sans 64'
+
+[org.cinnamon.settings-daemon.peripherals.keyboard]
+input-sources-switcher='alt-shift'
+
+[org.cinnamon.desktop.background]
+primary-color='#023c88'
+secondary-color='#5789ca'
+
+[org.cinnamon.desktop.interface]
+menus-have-icons=true
+font-name='Noto Sans 9'
+gtk-overlay-scrollbars=false
+gtk-theme='Mint-Y-Dark'
+icon-theme='Mint-Y'
+
+[org.cinnamon.desktop.wm.preferences]
+button-layout=':minimize,maximize,close'
+titlebar-font='Noto Sans Bold 10'
+theme='Mint-Y-Dark'
+
+[org.cinnamon.SessionManager]
+quit-delay-toggle=true
+prefer-hybrid-sleep=true
+
+[org.cinnamon.settings-daemon.plugins.xsettings]
+hinting='slight'
+menus-have-icons=true
+
+[org.cinnamon.settings-daemon.plugins.power]
+lock-on-suspend=true
+
+[org.cinnamon.theme]
+name='Mint-Y-Dark'
diff --git a/autostart.patch b/autostart.patch
new file mode 100644
index 0000000..b02f90f
--- /dev/null
+++ b/autostart.patch
@@ -0,0 +1,24 @@
+Index: Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon.session
+===================================================================
+--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon-session/sessions/cinnamon.session
++++ Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon.session
+@@ -1,6 +1,6 @@
+ [Cinnamon Session]
+ Name=Cinnamon
+-RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
++RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
+ DesktopName=X-Cinnamon
+
+
+Index: Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
+===================================================================
+--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
++++ Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
+@@ -1,6 +1,6 @@
+ [Cinnamon Session]
+ Name=Cinnamon (Software Rendering)
+-RequiredComponents=cinnamon2d;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
++RequiredComponents=cinnamon2d;cinnamon-screensaver;nemo-autostart;cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
+ DesktopName=X-Cinnamon
+
+
diff --git a/cinnamon-3.8.8_port_libnm.patch b/cinnamon-3.8.8_port_libnm.patch
new file mode 100644
index 0000000..f144c9b
--- /dev/null
+++ b/cinnamon-3.8.8_port_libnm.patch
@@ -0,0 +1,868 @@
+From f411d70b9fdd33bfc88d4fa458af2670e6350ae7 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak(a)v3.sk>
+Date: Fri, 6 Jul 2018 09:38:56 +0100
+Subject: [PATCH 1/4] Network applet: Port to libnm
+
+---
+ configure.ac | 2 +-
+ .../applets/network(a)cinnamon.org/applet.js | 293 ++++++++----------
+ js/misc/modemManager.js | 4 +-
+ src/Makefile.am | 2 +-
+ 4 files changed, 139 insertions(+), 162 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c8f251911..ade112733 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,7 +77,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+ libstartup-notification-1.0 >=
$STARTUP_NOTIFICATION_MIN_VERSION
+ gobject-introspection-1.0 >=
$GOBJECT_INTROSPECTION_MIN_VERSION
+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+- libnm-glib libnm-util atk-bridge-2.0)
++ libnm atk-bridge-2.0)
+
+ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+
+diff --git a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
+index ddea51a36..c6c63646d 100644
+--- a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
+@@ -2,8 +2,7 @@ const Applet = imports.ui.applet;
+ const GLib = imports.gi.GLib;
+ const GObject = imports.gi.GObject;
+ const Lang = imports.lang;
+-const NetworkManager = imports.gi.NetworkManager;
+-const NMClient = imports.gi.NMClient;
++const NM = imports.gi.NM;
+ const Signals = imports.signals;
+ const St = imports.gi.St;
+ const Mainloop = imports.mainloop;
+@@ -35,26 +34,14 @@ const NMAccessPointSecurity = {
+ };
+
+ // small optimization, to avoid using [] all the time
+-const NM80211Mode = NetworkManager['80211Mode'];
+-const NM80211ApFlags = NetworkManager['80211ApFlags'];
+-const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
++const NM80211Mode = NM['80211Mode'];
++const NM80211ApFlags = NM['80211ApFlags'];
++const NM80211ApSecurityFlags = NM['80211ApSecurityFlags'];
+
+ // number of wireless networks that should be visible
+ // (the remaining are placed into More...)
+ const NUM_VISIBLE_NETWORKS = 5;
+
+-function ssidCompare(one, two) {
+- if (!one || !two)
+- return false;
+- if (one.length != two.length)
+- return false;
+- for (let i = 0; i < one.length; i++) {
+- if (one[i] != two[i])
+- return false;
+- }
+- return true;
+-}
+-
+ // shared between NMNetworkMenuItem and NMDeviceWWAN
+ function signalToIcon(value) {
+ if (value > 80)
+@@ -76,7 +63,7 @@ function sortAccessPoints(accessPoints) {
+ }
+
+ function ssidToLabel(ssid) {
+- let label = NetworkManager.utils_ssid_to_utf8(ssid);
++ let label = NM.utils_ssid_to_utf8(ssid.get_data());
+ if (!label)
+ label = _("<unknown>");
+ return label;
+@@ -200,8 +187,10 @@ NMWiredSectionTitleMenuItem.prototype = {
+ this.setToggleState(device.connected);
+ // if this device is not controllable, hide the switch
+ this._switch.actor.visible = device.controllable;
+- } else
++ } else {
+ this.setStatus('');
++ this._switch.actor.visible = false;
++ }
+ },
+
+ activate: function(event) {
+@@ -386,7 +375,7 @@ NMDevice.prototype = {
+ },
+
+ deactivate: function() {
+- this.device.disconnect(function() {});
++ this.device.disconnect_async(null, null);
+ },
+
+ activate: function() {
+@@ -397,16 +386,16 @@ NMDevice.prototype = {
+ // pick the most recently used connection and connect to that
+ // or if no connections ever set, create an automatic one
+ if (this._connections.length > 0) {
+- this._client.activate_connection(this._connections[0].connection,
this.device, null, null);
++ this._client.activate_connection_async(this._connections[0].connection,
this.device, null, null, null);
+ } else if (this._autoConnectionName) {
+ let connection = this._createAutomaticConnection();
+ if (connection)
+- this._client.add_and_activate_connection(connection, this.device, null,
null);
++ this._client.add_and_activate_connection_async(connection, this.device,
null, null, null);
+ }
+ },
+
+ get connected() {
+- return this.device.state == NetworkManager.DeviceState.ACTIVATED;
++ return this.device.state == NM.DeviceState.ACTIVATED;
+ },
+
+ setActiveConnection: function(activeConnection) {
+@@ -493,25 +482,25 @@ NMDevice.prototype = {
+
+ get statusLabel(){
+ switch(this.device.state) {
+- case NetworkManager.DeviceState.DISCONNECTED:
+- case NetworkManager.DeviceState.ACTIVATED:
++ case NM.DeviceState.DISCONNECTED:
++ case NM.DeviceState.ACTIVATED:
+ return null;
+- case NetworkManager.DeviceState.UNMANAGED:
++ case NM.DeviceState.UNMANAGED:
+ /* Translators: this is for network devices that are physically present but
are not
+ under NetworkManager's control (and thus cannot be used in the menu)
*/
+ return _("unmanaged");
+- case NetworkManager.DeviceState.DEACTIVATING:
++ case NM.DeviceState.DEACTIVATING:
+ return _("disconnecting...");
+- case NetworkManager.DeviceState.PREPARE:
+- case NetworkManager.DeviceState.CONFIG:
+- case NetworkManager.DeviceState.IP_CONFIG:
+- case NetworkManager.DeviceState.IP_CHECK:
+- case NetworkManager.DeviceState.SECONDARIES:
++ case NM.DeviceState.PREPARE:
++ case NM.DeviceState.CONFIG:
++ case NM.DeviceState.IP_CONFIG:
++ case NM.DeviceState.IP_CHECK:
++ case NM.DeviceState.SECONDARIES:
+ return _("connecting...");
+- case NetworkManager.DeviceState.NEED_AUTH:
++ case NM.DeviceState.NEED_AUTH:
+ /* Translators: this is for network connections that require some kind of
key or password */
+ return _("authentication required");
+- case NetworkManager.DeviceState.UNAVAILABLE:
++ case NM.DeviceState.UNAVAILABLE:
+ // This state is actually a compound of various states (generically
unavailable,
+ // firmware missing, carrier not available), that are exposed by different
properties
+ // (whose state may or may not updated when we receive state-changed).
+@@ -522,7 +511,7 @@ NMDevice.prototype = {
+ module, which is missing */
+ return _("firmware missing");
+ }
+- if (this.device.capabilities &
NetworkManager.DeviceCapabilities.CARRIER_DETECT) {
++ if (this.device.capabilities & NM.DeviceCapabilities.CARRIER_DETECT) {
+ if (!this._carrierChangedId)
+ this._carrierChangedId =
this.device.connect('notify::carrier', Lang.bind(this, this._substateChanged));
+ if (!this.carrier) {
+@@ -533,7 +522,7 @@ NMDevice.prototype = {
+ /* Translators: this is for a network device that cannot be activated (for
example it
+ is disabled by rfkill, or it has no coverage */
+ return _("unavailable");
+- case NetworkManager.DeviceState.FAILED:
++ case NM.DeviceState.FAILED:
+ return _("connection failed");
+ default:
+ log('Device state invalid, is %d'.format(this.device.state));
+@@ -543,7 +532,7 @@ NMDevice.prototype = {
+
+ get controllable(){
+ // controllable for every state except unavailable or unmanaged
+- if(this.device.state === NetworkManager.DeviceState.UNAVAILABLE ||
this.device.state === NetworkManager.DeviceState.UNMANAGED)
++ if(this.device.state === NM.DeviceState.UNAVAILABLE || this.device.state ===
NM.DeviceState.UNMANAGED)
+ return false;
+
+ return true;
+@@ -575,7 +564,7 @@ NMDevice.prototype = {
+ },
+
+ _shouldShowConnectionList: function() {
+- return (this.device.state >= NetworkManager.DeviceState.DISCONNECTED);
++ return (this.device.state >= NM.DeviceState.DISCONNECTED);
+ },
+
+ _createSection: function() {
+@@ -592,7 +581,7 @@ NMDevice.prototype = {
+ for(let j = 0; j < this._connections.length; ++j) {
+ let obj = this._connections[j];
+ if (this._activeConnection &&
+- obj.connection == this._activeConnection._connection)
++ obj.connection == this._activeConnection.connection)
+ continue;
+ obj.item = this._createConnectionItem(obj);
+
+@@ -610,7 +599,7 @@ NMDevice.prototype = {
+ this._autoConnectionItem.connect('activate', Lang.bind(this,
function() {
+ let connection = this._createAutomaticConnection();
+ if (connection)
+- this._client.add_and_activate_connection(connection, this.device,
null, null);
++ this._client.add_and_activate_connection_async(connection,
this.device, null, null, null);
+ }));
+ this.section.addMenuItem(this._autoConnectionItem);
+ }
+@@ -621,14 +610,14 @@ NMDevice.prototype = {
+ let item = new PopupMenu.PopupMenuItem(obj.name);
+
+ item.connect('activate', Lang.bind(this, function() {
+- this._client.activate_connection(connection, this.device, null, null);
++ this._client.activate_connection_async(connection, this.device, null, null,
null);
+ }));
+ return item;
+ },
+
+ _createActiveConnectionItem: function() {
+ let title;
+- let active = this._activeConnection._connection;
++ let active = this._activeConnection.connection;
+ if (active) {
+ title = active._name;
+ } else {
+@@ -646,11 +635,11 @@ NMDevice.prototype = {
+ return;
+ }
+
+- if (oldstate == NetworkManager.DeviceState.ACTIVATED) {
++ if (oldstate == NM.DeviceState.ACTIVATED) {
+ this.emit('network-lost');
+ }
+
+- if (newstate == NetworkManager.DeviceState.FAILED) {
++ if (newstate == NM.DeviceState.FAILED) {
+ this.emit('activation-failed', reason);
+ }
+
+@@ -694,10 +683,10 @@ NMDevice.prototype = {
+ }
+ else {
+ switch (this.device.get_device_type()) {
+- case NetworkManager.DeviceType.ETHERNET: return
_("Ethernet");
+- case NetworkManager.DeviceType.WIFI: return _("Wifi");
+- case NetworkManager.DeviceType.MODEM: return _("Modem");
+- case NetworkManager.DeviceType.BT: return _("Bluetooth");
++ case NM.DeviceType.ETHERNET: return _("Ethernet");
++ case NM.DeviceType.WIFI: return _("Wifi");
++ case NM.DeviceType.MODEM: return _("Modem");
++ case NM.DeviceType.BT: return _("Bluetooth");
+ default: return "";
+ }
+ }
+@@ -748,13 +737,13 @@ NMDeviceWired.prototype = {
+ },
+
+ _createAutomaticConnection: function() {
+- let connection = new NetworkManager.Connection();
+- connection._uuid = NetworkManager.utils_uuid_generate();
+- connection.add_setting(new NetworkManager.SettingWired());
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let connection = new NM.SimpleConnection();
++ connection._uuid = NM.utils_uuid_generate();
++ connection.add_setting(new NM.SettingWired());
++ connection.add_setting(new NM.SettingConnection({
+ uuid: connection._uuid,
+ id: this._autoConnectionName,
+- type: NetworkManager.SETTING_WIRED_SETTING_NAME,
++ type: NM.SETTING_WIRED_SETTING_NAME,
+ autoconnect: true
+ }));
+ return connection;
+@@ -781,26 +770,26 @@ NMDeviceModem.prototype = {
+ try {
+ is_wwan = true;
+ this.mobileDevice = new ModemManager.BroadbandModem(device.udi,
device.current_capabilities);
+- if (this._capabilities &
NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
+- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
+- } else if (this._capabilities &
NetworkManager.DeviceModemCapabilities.LTE) {
+- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
+- } else if (this._capabilities &
NetworkManager.DeviceModemCapabilities.CDMA_EVDO) {
+- this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
++ if (this._capabilities & NM.DeviceModemCapabilities.GSM_UMTS) {
++ this._connectionType = NM.SETTING_GSM_SETTING_NAME;
++ } else if (this._capabilities & NM.DeviceModemCapabilities.LTE) {
++ this._connectionType = NM.SETTING_GSM_SETTING_NAME;
++ } else if (this._capabilities &
NM.DeviceModemCapabilities.CDMA_EVDO) {
++ this._connectionType = NM.SETTING_CDMA_SETTING_NAME;
+ }
+ }
+ catch (e){
+ global.logError(e);
+ }
+- } else if (this._capabilities &
NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
++ } else if (this._capabilities & NM.DeviceModemCapabilities.GSM_UMTS) {
+ is_wwan = true;
+ this.mobileDevice = new ModemManager.ModemGsm(device.udi);
+- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
+- } else if (this._capabilities &
NetworkManager.DeviceModemCapabilities.CDMA_EVDO) {
++ this._connectionType = NM.SETTING_GSM_SETTING_NAME;
++ } else if (this._capabilities & NM.DeviceModemCapabilities.CDMA_EVDO) {
+ is_wwan = true;
+ this.mobileDevice = new ModemManager.ModemCdma(device.udi);
+- this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
+- } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE)
{
++ this._connectionType = NM.SETTING_CDMA_SETTING_NAME;
++ } else if (this._capabilities & NM.DeviceModemCapabilities.LTE) {
+ is_wwan = true;
+ // FIXME: support signal quality
+ }
+@@ -848,7 +837,7 @@ NMDeviceModem.prototype = {
+ },
+
+ get connected() {
+- return this._enabled && this.device.state ==
NetworkManager.DeviceState.ACTIVATED;
++ return this._enabled && this.device.state == NM.DeviceState.ACTIVATED;
+ },
+
+ destroy: function() {
+@@ -917,13 +906,13 @@ NMDeviceBluetooth.prototype = {
+ },
+
+ _createAutomaticConnection: function() {
+- let connection = new NetworkManager.Connection();
+- connection._uuid = NetworkManager.utils_uuid_generate();
+- connection.add_setting(new NetworkManager.SettingBluetooth());
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let connection = new NM.SimpleConnection();
++ connection._uuid = NM.utils_uuid_generate();
++ connection.add_setting(new NM.SettingBluetooth());
++ connection.add_setting(new NM.SettingConnection({
+ uuid: connection._uuid,
+ id: this._autoConnectionName,
+- type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
++ type: NM.SETTING_BLUETOOTH_SETTING_NAME,
+ autoconnect: false
+ }));
+ return connection;
+@@ -963,7 +952,7 @@ NMDeviceVPN.prototype = {
+ },
+
+ connectionValid: function(connection) {
+- return connection._type == NetworkManager.SETTING_VPN_SETTING_NAME;
++ return connection._type == NM.SETTING_VPN_SETTING_NAME;
+ },
+
+ get empty() {
+@@ -986,7 +975,7 @@ NMDeviceVPN.prototype = {
+
+ deactivate: function() {
+ if (this._activeConnection)
+- this._client.deactivate_connection(this._activeConnection);
++ this._client.deactivate_connection(this._activeConnection, null);
+ },
+
+ statusLabel: null,
+@@ -1128,7 +1117,7 @@ NMDeviceWireless.prototype = {
+ for (let i = 0; i < bestApObj.accessPoints.length; i++) {
+ let ap = bestApObj.accessPoints[i];
+ if (ap.connection_valid(best)) {
+- this._client.activate_connection(best, this.device, ap.dbus_path,
null);
++ this._client.activate_connection_async(best, this.device, ap.path,
null, null);
+ break;
+ }
+ }
+@@ -1142,7 +1131,7 @@ NMDeviceWireless.prototype = {
+ if (this._networks.length > 0) {
+ let connection = this._createAutomaticConnection(this._networks[0]);
+ let accessPoints = sortAccessPoints(this._networks[0].accessPoints);
+- this._client.add_and_activate_connection(connection, this.device,
accessPoints[0].dbus_path, null);
++ this._client.add_and_activate_connection_async(connection, this.device,
accessPoints[0].path, null, null);
+ }
+ },
+
+@@ -1229,7 +1218,7 @@ NMDeviceWireless.prototype = {
+ },
+
+ _networkCompare: function(network, accessPoint) {
+- if (!ssidCompare(network.ssid, accessPoint.get_ssid()))
++ if (!network.ssid.equal (accessPoint.get_ssid()))
+ return false;
+ if (network.mode != accessPoint.mode)
+ return false;
+@@ -1396,7 +1385,7 @@ NMDeviceWireless.prototype = {
+ let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
+ for (let i = 0; i < accessPoints.length; i++) {
+ if (accessPoints[i].connection_valid(connection)) {
+- this._client.activate_connection(connection, this.device,
accessPoints[i].dbus_path, null);
++ this._client.activate_connection_async(connection, this.device,
accessPoints[i].path, null, null);
+ break;
+ }
+ }
+@@ -1503,8 +1492,7 @@ NMDeviceWireless.prototype = {
+ },
+
+ _createActiveConnectionItem: function() {
+- if (this._activeConnection._connection) {
+- let connection = this._activeConnection._connection;
++ if (this._activeConnection.connection) {
+ if (!this._activeNetwork) {
+ if (this.device.active_access_point) {
+ let networkPos =
this._findNetwork(this.device.active_access_point);
+@@ -1520,7 +1508,7 @@ NMDeviceWireless.prototype = {
+ if (this._activeNetwork)
+ this._activeConnectionItem = new
NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined, { reactive: false });
+ else
+- this._activeConnectionItem = new
PopupMenu.PopupImageMenuItem(connection._name, 'network-wireless-connected', {
reactive: false });
++ this._activeConnectionItem = new
PopupMenu.PopupImageMenuItem(this._activeConnection.connection._name,
'network-wireless-connected', { reactive: false });
+ } else {
+ // We cannot read the connection (due to ACL, or API incompatibility), but
we still show signal if we have it
+ if (this._activeNetwork)
+@@ -1536,25 +1524,26 @@ NMDeviceWireless.prototype = {
+
+ _createAutomaticConnection: function(apObj) {
+ let name;
+- let ssid = NetworkManager.utils_ssid_to_utf8(apObj.ssid);
++ let ssid = NM.utils_ssid_to_utf8(apObj.ssid.get_data());
+ if (ssid) {
+ /* TRANSLATORS: this the automatic wireless connection name (including the
network name) */
+ name = _("Auto %s").format(ssid);
+ } else
+ name = _("Auto wireless");
+
+- let connection = new NetworkManager.Connection();
+- connection.add_setting(new NetworkManager.SettingWireless());
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let connection = new NM.SimpleConnection();
++ connection.add_setting(new NM.SettingWireless());
++ connection.add_setting(new NM.SettingConnection({
+ id: name,
+ autoconnect: true, // NetworkManager will know to ignore this if
appropriate
+- uuid: NetworkManager.utils_uuid_generate(),
+- type: NetworkManager.SETTING_WIRELESS_SETTING_NAME
++ uuid: NM.utils_uuid_generate(),
++ type: NM.SETTING_WIRELESS_SETTING_NAME
+ }));
+ return connection;
+ },
+
+ _createNetworkItem: function(apObj, position) {
++
+ if(!apObj.accessPoints || apObj.accessPoints.length == 0) {
+ // this should not happen, but I have no idea why it happens
+ return;
+@@ -1578,10 +1567,10 @@ NMDeviceWireless.prototype = {
+ // 802.1x-enabled APs require further configuration, so they're
+ // handled in cinnamon-settings
+ Util.spawn(['cinnamon-settings', 'network',
'connect-8021x-wifi',
+- this.device.get_path(), accessPoints[0].dbus_path]);
++ this.device.get_path(), accessPoints[0].path]);
+ } else {
+ let connection = this._createAutomaticConnection(apObj);
+- this._client.add_and_activate_connection(connection, this.device,
accessPoints[0].dbus_path, null);
++ this._client.add_and_activate_connection_async(connection,
this.device, accessPoints[0].path, null, null);
+ }
+ }));
+ }
+@@ -1684,7 +1673,16 @@ CinnamonNetworkApplet.prototype = {
+ this._currentIconName = undefined;
+ this._setIcon('network-offline');
+
+- this._client = NMClient.Client.new();
++ NM.Client.new_async(null, Lang.bind(this, this._clientGot));
++ }
++ catch (e) {
++ global.logError(e);
++ }
++ },
++
++ _clientGot: function(obj, result) {
++ try {
++ this._client = NM.Client.new_finish(result);
+
+ this._statusSection = new PopupMenu.PopupMenuSection();
+ this._statusItem = new PopupMenu.PopupMenuItem('', { style_class:
'popup-inactive-menu-item', reactive: false });
+@@ -1750,7 +1748,7 @@ CinnamonNetworkApplet.prototype = {
+ let devices = this._devices.wireless.devices;
+
+ for (let i = 0; i < devices.length; i++) {
+- devices[i].device.request_scan_simple(null);
++ devices[i].device.request_scan(null);
+ }
+ }));
+
+@@ -1773,42 +1771,36 @@ CinnamonNetworkApplet.prototype = {
+
+ // Device types
+ this._dtypes = { };
+- this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
+- this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
+- this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
+- this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
+- // TODO: WiMax support
++ this._dtypes[NM.DeviceType.ETHERNET] = NMDeviceWired;
++ this._dtypes[NM.DeviceType.WIFI] = NMDeviceWireless;
++ this._dtypes[NM.DeviceType.MODEM] = NMDeviceModem;
++ this._dtypes[NM.DeviceType.BT] = NMDeviceBluetooth;
+
+ // Connection types
+ this._ctypes = { };
+- this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] =
NMConnectionCategory.WIRELESS;
+- this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] =
NMConnectionCategory.WIRED;
+- this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] =
NMConnectionCategory.WIRED;
+- this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] =
NMConnectionCategory.WIRED;
+- this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] =
NMConnectionCategory.WWAN;
+- this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] =
NMConnectionCategory.WWAN;
+- this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] =
NMConnectionCategory.WWAN;
+- this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] =
NMConnectionCategory.VPN;
+-
+- this._settings = NMClient.RemoteSettings.new(null);
+- this._connectionsReadId = this._settings.connect('connections-read',
Lang.bind(this, function() {
+- this._readConnections();
+- this._readDevices();
+- this._syncNMState();
+-
+- // Connect to signals late so that early signals don't find in
inconsistent state
+- // and connect only once (this signal handler can be called again if
NetworkManager goes up and down)
+- if (!this._inited) {
+- this._inited = true;
+- this._client.connect('notify::manager-running',
Lang.bind(this, this._syncNMState));
+- this._client.connect('notify::networking-enabled',
Lang.bind(this, this._syncNMState));
+- this._client.connect('notify::state', Lang.bind(this,
this._syncNMState));
+- this._client.connect('notify::active-connections',
Lang.bind(this, this._updateIcon));
+- this._client.connect('device-added', Lang.bind(this,
this._deviceAdded));
+- this._client.connect('device-removed', Lang.bind(this,
this._deviceRemoved));
+- this._settings.connect('new-connection', Lang.bind(this,
this._newConnection));
+- }
+- }));
++ this._ctypes[NM.SETTING_WIRELESS_SETTING_NAME] =
NMConnectionCategory.WIRELESS;
++ this._ctypes[NM.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
++ this._ctypes[NM.SETTING_PPPOE_SETTING_NAME] = NMConnectionCategory.WIRED;
++ this._ctypes[NM.SETTING_PPP_SETTING_NAME] = NMConnectionCategory.WIRED;
++ this._ctypes[NM.SETTING_BLUETOOTH_SETTING_NAME] =
NMConnectionCategory.WWAN;
++ this._ctypes[NM.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
++ this._ctypes[NM.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
++ this._ctypes[NM.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
++
++ this._readConnections();
++ this._readDevices();
++ this._syncNMState();
++
++ this._client.connect('notify::nm-running', Lang.bind(this,
this._syncNMState));
++ this._client.connect('notify::networking-enabled', Lang.bind(this,
this._syncNMState));
++ this._client.connect('notify::state', Lang.bind(this,
this._syncNMState));
++ this._client.connect('notify::active-connections', Lang.bind(this,
this._updateIcon));
++ this._client.connect('device-added', Lang.bind(this,
this._deviceAdded));
++ this._client.connect('device-removed', Lang.bind(this,
this._deviceRemoved));
++ this._client.connect('connection-added', Lang.bind(this,
this._connectionAdded));
++ this._client.connect('connection-removed', Lang.bind(this,
this._connectionRemoved));
++
++ this._inited = true;
+
+ this._periodicUpdateIcon();
+
+@@ -1951,7 +1943,7 @@ CinnamonNetworkApplet.prototype = {
+
+ this._syncSectionTitle(wrapper.category);
+ } else
+- log('Invalid network device type, is ' + device.get_device_type());
++ log('Unknown network device type, is ' + device.get_device_type());
+ },
+
+ _deviceRemoved: function(client, device) {
+@@ -2009,24 +2001,12 @@ CinnamonNetworkApplet.prototype = {
+ a._inited = true;
+ }
+
+- if (!a._connection) {
+- a._connection = this._settings.get_connection_by_path(a.connection);
+-
+- if (a._connection) {
+- a._type = a._connection._type;
+- a._section = this._ctypes[a._type];
+- if (a._errorLogged) {
+- log('network applet: Found connection for active');
+- a._errorLogged = false;
+- }
+- } else {
+- a._connection = null;
+- a._type = null;
+- a._section = null;
+- if (!a._errorLogged) {
+- a._errorLogged = true;
+- log('network applet: Cannot find connection for active (or
connection cannot be read)');
+- }
++ if (!a._type) {
++ a._type = a.connection._type;
++ a._section = this._ctypes[a._type];
++ if (a._errorLogged) {
++ log('network applet: Found connection for active');
++ a._errorLogged = false;
+ }
+ }
+
+@@ -2036,7 +2016,7 @@ CinnamonNetworkApplet.prototype = {
+ continue;
+ }
+
+- if (a.state == NetworkManager.ActiveConnectionState.ACTIVATED) {
++ if (a.state == NM.ActiveConnectionState.ACTIVATED) {
+ if (!default_ip4) {
+ // We didn't find the default IPV4 device yet..
+ if (!default_ip6) {
+@@ -2051,7 +2031,7 @@ CinnamonNetworkApplet.prototype = {
+ }
+ }
+ }
+- if (a.state == NetworkManager.ActiveConnectionState.ACTIVATING) {
++ if (a.state == NM.ActiveConnectionState.ACTIVATING) {
+ activating = a;
+ }
+
+@@ -2063,7 +2043,7 @@ CinnamonNetworkApplet.prototype = {
+ }
+
+ if (!a._primaryDevice) {
+- if (a._type != NetworkManager.SETTING_VPN_SETTING_NAME) {
++ if (a._type != NM.SETTING_VPN_SETTING_NAME) {
+ // find a good device to be considered primary
+ a._primaryDevice = null;
+ let devices = a.get_devices() || [ ];
+@@ -2080,7 +2060,7 @@ CinnamonNetworkApplet.prototype = {
+ if (a._primaryDevice)
+ a._primaryDevice.setActiveConnection(a);
+
+- if (a.state == NetworkManager.ActiveConnectionState.ACTIVATED
&&
++ if (a.state == NM.ActiveConnectionState.ACTIVATED &&
+ a._primaryDevice && a._primaryDevice._notification) {
+ a._primaryDevice._notification.destroy();
+ a._primaryDevice._notification = null;
+@@ -2092,7 +2072,7 @@ CinnamonNetworkApplet.prototype = {
+ },
+
+ _notifyActivated: function(activeConnection) {
+- if (activeConnection.state == NetworkManager.ActiveConnectionState.ACTIVATED
&&
++ if (activeConnection.state == NM.ActiveConnectionState.ACTIVATED &&
+ activeConnection._primaryDevice &&
activeConnection._primaryDevice._notification) {
+ activeConnection._primaryDevice._notification.destroy();
+ activeConnection._primaryDevice._notification = null;
+@@ -2102,29 +2082,27 @@ CinnamonNetworkApplet.prototype = {
+ },
+
+ _readConnections: function() {
+- let connections = this._settings.list_connections();
++ let connections = this._client.get_connections();
+ for (let i = 0; i < connections.length; i++) {
+ let connection = connections[i];
+ if (connection._uuid) {
+ // connection was already seen (for example because NetworkManager was
restarted)
+ continue;
+ }
+- connection._removedId = connection.connect('removed',
Lang.bind(this, this._connectionRemoved));
+- connection._updatedId = connection.connect('updated',
Lang.bind(this, this._updateConnection));
++ connection._updatedId = connection.connect('changed',
Lang.bind(this, this._updateConnection));
+
+ this._updateConnection(connection);
+ this._connections.push(connection);
+ }
+ },
+
+- _newConnection: function(settings, connection) {
++ _connectionAdded: function(client, connection) {
+ if (connection._uuid) {
+ // connection was already seen
+ return;
+ }
+
+- connection._removedId = connection.connect('removed', Lang.bind(this,
this._connectionRemoved));
+- connection._updatedId = connection.connect('updated', Lang.bind(this,
this._updateConnection));
++ connection._updatedId = connection.connect('changed', Lang.bind(this,
this._updateConnection));
+
+ this._updateConnection(connection);
+ this._connections.push(connection);
+@@ -2132,7 +2110,7 @@ CinnamonNetworkApplet.prototype = {
+ this._updateIcon();
+ },
+
+- _connectionRemoved: function(connection) {
++ _connectionRemoved: function(client, connection) {
+ let pos = this._connections.indexOf(connection);
+ if (pos != -1)
+ this._connections.splice(pos);
+@@ -2150,12 +2128,11 @@ CinnamonNetworkApplet.prototype = {
+ }
+
+ connection._uuid = null;
+- connection.disconnect(connection._removedId);
+ connection.disconnect(connection._updatedId);
+ },
+
+ _updateConnection: function(connection) {
+- let connectionSettings =
connection.get_setting_by_name(NetworkManager.SETTING_CONNECTION_SETTING_NAME);
++ let connectionSettings =
connection.get_setting_by_name(NM.SETTING_CONNECTION_SETTING_NAME);
+ connection._type = connectionSettings.type;
+
+ connection._section = this._ctypes[connection._type] ||
NMConnectionCategory.INVALID;
+@@ -2201,7 +2178,7 @@ CinnamonNetworkApplet.prototype = {
+ },
+
+ _syncNMState: function() {
+- if (!this._client.manager_running) {
++ if (!this._client.nm_running) {
+ log('NetworkManager is not running, hiding...');
+ this.menu.close();
+ this.actor.hide();
+@@ -2231,7 +2208,7 @@ CinnamonNetworkApplet.prototype = {
+ if (!mc) {
+ this._setIcon('network-offline');
+ this.set_applet_tooltip(_("No connection"));
+- } else if (mc.state == NetworkManager.ActiveConnectionState.ACTIVATING) {
++ } else if (mc.state == NM.ActiveConnectionState.ACTIVATING) {
+ new_delay = FAST_PERIODIC_UPDATE_FREQUENCY_SECONDS;
+ switch (mc._section) {
+ case NMConnectionCategory.WWAN:
+@@ -2273,7 +2250,7 @@ CinnamonNetworkApplet.prototype = {
+ this.set_applet_tooltip(_("Connected to the wireless
network"));
+ } else {
+ this._setIcon('network-wireless-signal-' +
signalToIcon(ap.strength));
+- this.set_applet_tooltip(_("Wireless connection") +
": " + ap.get_ssid() + " ("+ ap.strength +"%)");
++ this.set_applet_tooltip(_("Wireless connection") +
": " + ssidToLabel(ap.get_ssid()) + " ("+ ap.strength
+"%)");
+ }
+ } else {
+ log('Active connection with no primary device?');
+diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
+index 6f95ead2a..b7d455ff3 100644
+--- a/js/misc/modemManager.js
++++ b/js/misc/modemManager.js
+@@ -2,7 +2,7 @@
+
+ const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+-const NMGtk = imports.gi.NMGtk;
++const NMA = imports.gi.NMA;
+ const Signals = imports.signals;
+
+ // _getMobileProvidersDatabase:
+@@ -14,7 +14,7 @@ let _mpd;
+ function _getMobileProvidersDatabase() {
+ if (_mpd == null) {
+ try {
+- _mpd = new NMGtk.MobileProvidersDatabase();
++ _mpd = new NMA.MobileProvidersDatabase();
+ _mpd.init(null);
+ } catch (e) {
+ log(e.message);
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9fdfe0a06..ad314d8ba 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -222,7 +222,7 @@ libcinnamon_la_LIBADD = \
+ libcinnamon_la_CPPFLAGS = $(MUFFIN_CFLAGS) $(cinnamon_cflags)
+
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-0 ClutterX11-0 CoglPango-0 Cogl-0 Meta-Muffin.0
Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-0 ClutterX11-0 CoglPango-0 Cogl-0 Meta-Muffin.0
Soup-2.4 CMenu-3.0 NM-1.0
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+
+From 7555c8d67802abc143ed27ddee190ef567837415 Mon Sep 17 00:00:00 2001
+From: ?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82(a)fedoraproject.org>
+Date: Fri, 6 Jul 2018 09:41:10 +0100
+Subject: [PATCH 2/4] network: Support user connections
+
+---
+ .../applets/network(a)cinnamon.org/applet.js | 32 ++++++++++++++++---
+ 1 file changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
+index c6c63646d..ca441cd58 100644
+--- a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
+@@ -73,6 +73,11 @@ function NMNetworkMenuItem() {
+ this._init.apply(this, arguments);
+ }
+
++function default_to_private_connections(client) {
++ let perms = client.get_permission_result
(NM.Client.ClientPermission.SETTINGS_MODIFY_SYSTEM);
++ return (perms != NM.Client.ClientPermissionResult.YES);
++}
++
+ NMNetworkMenuItem.prototype = {
+ __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+
+@@ -740,12 +745,14 @@ NMDeviceWired.prototype = {
+ let connection = new NM.SimpleConnection();
+ connection._uuid = NM.utils_uuid_generate();
+ connection.add_setting(new NM.SettingWired());
+- connection.add_setting(new NM.SettingConnection({
++ let setting_conn = new NM.SettingConnection({
+ uuid: connection._uuid,
+ id: this._autoConnectionName,
+ type: NM.SETTING_WIRED_SETTING_NAME,
+ autoconnect: true
+- }));
++ });
++ setting_conn.add_permission('user', GLib.get_user_name(), null);
++ connection.add_setting(setting_conn);
+ return connection;
+ }
+ };
+@@ -995,6 +1002,8 @@ NMDeviceWireless.prototype = {
+ this._overflowItem = null;
+ this._networks = [ ];
+
++ this._client = client;
++
+ // breaking the layers with this, but cannot call
+ // this.connectionValid until I have a device
+ this.device = device;
+@@ -1533,12 +1542,27 @@ NMDeviceWireless.prototype = {
+
+ let connection = new NM.SimpleConnection();
+ connection.add_setting(new NM.SettingWireless());
+- connection.add_setting(new NM.SettingConnection({
++ let setting_conn = new NM.SettingConnection({
+ id: name,
+ autoconnect: true, // NetworkManager will know to ignore this if
appropriate
+ uuid: NM.utils_uuid_generate(),
+ type: NM.SETTING_WIRELESS_SETTING_NAME
+- }));
++ });
++ if (default_to_private_connections(this._client)) {
++ setting_conn.add_permission('user', GLib.get_user_name(), null);
++ if (apObj.security == NMAccessPointSecurity.WPA2_PSK ||
++ apObj.security == NMAccessPointSecurity.WPA_PSK) {
++ connection.add_setting(new NM.SettingWirelessSecurity({
++ psk_flags: NM.SettingSecretFlags.AGENT_OWNED
++ }));
++ }
++ if (apObj.security == NMAccessPointSecurity.WEP) {
++ connection.add_setting(new NM.SettingWirelessSecurity({
++ wep_key_flags: NM.SettingSecretFlags.AGENT_OWNED
++ }));
++ }
++ }
++ connection.add_setting(setting_conn);
+ return connection;
+ },
+
+
+From c30f921431e02a2f35e6234c5500592b46f52f4e Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)fedoraproject.org>
+Date: Sun, 22 Jul 2018 12:58:32 +0100
+Subject: [PATCH 4/4] Fix mistake
+
+---
+ .../usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
+index ca441cd58..3d6015099 100644
+--- a/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/network(a)cinnamon.org/applet.js
+@@ -74,8 +74,8 @@ function NMNetworkMenuItem() {
+ }
+
+ function default_to_private_connections(client) {
+- let perms = client.get_permission_result
(NM.Client.ClientPermission.SETTINGS_MODIFY_SYSTEM);
+- return (perms != NM.Client.ClientPermissionResult.YES);
++ let perms = client.get_permission_result
(NM.ClientPermission.SETTINGS_MODIFY_SYSTEM);
++ return (perms != NM.ClientPermissionResult.YES);
+ }
+
+ NMNetworkMenuItem.prototype = {
diff --git a/cinnamon.spec b/cinnamon.spec
new file mode 100644
index 0000000..3b3529e
--- /dev/null
+++ b/cinnamon.spec
@@ -0,0 +1,1254 @@
+%global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so
+
+%global cjs_version 4.0.0
+%global cinnamon_desktop_version 4.0.0
+%global gobject_introspection_version 1.38.0
+%global muffin_version 4.0.0
+%global json_glib_version 0.13.2
+
+# For wallpaper.
+%global rawhide_version 30
+%global release_version %(echo $((%{rawhide_version} - 1)))
+
+%global __python %{__python3}
+
+Name: cinnamon
+Version: 4.0.0
+Release: 1%{?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
+Source1: polkit-%{name}-authentication-agent-1.desktop
+Source2: 10_cinnamon-common.gschema.override
+Source3: 10_cinnamon-apps.gschema.override.in
+
+Patch0: autostart.patch
+Patch1: set_wheel.patch
+Patch2: revert_25aef37.patch
+Patch3: default_panal_launcher.patch
+Patch4: remove_crap_from_menu.patch
+Patch5: replace-metacity-with-openbox.patch
+Patch6: set_fedora_menu_icon.patch
+Patch7: %{url}/pull/7699.patch#/%{name}-3.8.8_port_libnm.patch
+
+
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: desktop-file-utils
+BuildRequires: pkgconfig(cjs-1.0) >= %{cjs_version}
+BuildRequires: pkgconfig(gconf-2.0)
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(gnome-bluetooth-1.0)
+BuildRequires: pkgconfig(libgnome-menu-3.0)
+BuildRequires: pkgconfig(lib%{name}-menu-3.0)
+BuildRequires: pkgconfig(%{name}-desktop) >= %{cinnamon_desktop_version}
+BuildRequires: gobject-introspection >= %{gobject_introspection_version}
+BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
+BuildRequires: pkgconfig(upower-glib)
+BuildRequires: pkgconfig(libnm)
+BuildRequires: pkgconfig(polkit-agent-1)
+BuildRequires: pkgconfig(gudev-1.0)
+
+# for screencast recorder functionality
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: intltool
+BuildRequires: pkgconfig(libcanberra)
+BuildRequires: pkgconfig(libcroco-0.6)
+BuildRequires: pkgconfig(gnome-keyring-1)
+BuildRequires: pkgconfig(libsoup-2.4)
+
+# used in unused BigThemeImage
+BuildRequires: pkgconfig(librsvg-2.0)
+BuildRequires: pkgconfig(libmuffin) >= %{muffin_version}
+BuildRequires: pkgconfig(libpulse)
+
+# Bootstrap requirements
+BuildRequires: pkgconfig(gtk-doc)
+BuildRequires: gnome-common
+
+# media keys
+BuildRequires: pkgconfig(libnotify)
+BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(colord)
+%ifnarch s390 s390x
+BuildRequires: pkgconfig(libwacom)
+BuildRequires: pkgconfig(xorg-wacom)
+%endif
+BuildRequires: pkgconfig(xtst)
+
+Requires: %{name}-desktop >= %{cinnamon_desktop_version}
+Requires: muffin%{?_isa} >= %{muffin_version}
+Requires: cjs%{?_isa} >= %{cjs_version}
+Requires: gnome-menus%{?_isa} >= 3.0.0-2
+
+# wrapper script used to restart old GNOME session if run --replace
+# from the command line
+Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
+
+# needed for loading SVG's via gdk-pixbuf
+Requires: librsvg2%{?_isa}
+
+# needed as it is now split from Clutter
+Requires: json-glib%{?_isa} >= %{json_glib_version}
+Requires: upower%{?_isa}
+Requires: polkit%{?_isa} >= 0.100
+
+# needed for session files
+Requires: %{name}-session%{?_isa}
+
+# needed for schemas
+Requires: at-spi2-atk%{?_isa}
+
+# needed for on-screen keyboard
+Requires: caribou%{?_isa}
+
+# needed for the user menu
+Requires: accountsservice-libs%{?_isa}
+
+# needed for settings
+Requires: python3-pexpect
+Requires: python3-gobject%{?_isa}
+Requires: python3-dbus%{?_isa}
+Requires: python3-lxml%{?_isa}
+Requires: python3-pillow%{?_isa}
+Requires: python3-pam
+Requires: mintlocale
+Requires: %{name}-control-center%{?_isa}
+Requires: %{name}-translations
+
+# needed for theme overrides
+%if 0%{?fedora}
+Requires: desktop-backgrounds-basic
+Requires: desktop-backgrounds-gnome
+%endif
+Requires: gnome-backgrounds
+Requires: system-logos
+
+# Theming
+Requires: google-noto-sans-fonts
+Requires: %{name}-themes
+
+# RequiredComponents in the session files
+Requires: nemo%{?_isa}
+Requires: %{name}-screensaver%{?_isa}
+
+# openbox and tint2 are needed for fallback
+Requires: openbox%{?_isa}
+Requires: tint2%{?_isa}
+
+# required for keyboard applet
+Requires: gucharmap%{?_isa}
+Requires: xapps%{?_isa}
+Requires: python3-xapps-overrides%{?_isa}
+
+# required for network applet
+Requires: nm-connection-editor%{?_isa}
+Requires: network-manager-applet%{?_isa}
+
+Requires: python3-inotify
+
+
+# required for cinnamon-killer-daemon
+Requires: keybinder3%{?_isa}
+
+# required for sound applet
+Requires: wget%{?_isa}
+
+Provides: desktop-notification-daemon
+
+%description
+Cinnamon is a Linux desktop which provides advanced
+innovative features and a traditional user experience.
+
+The desktop layout is similar to Gnome 2.
+The underlying technology is forked from Gnome Shell.
+The emphasis is put on making users feel at home and providing
+them with an easy to use and comfortable desktop experience.
+
+
+%package devel-doc
+Summary: Development Documentation files for Cinnamon
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description devel-doc
+This package contains the code documentation for various Cinnamon components.
+
+
+%prep
+%autosetup -p1 -n Cinnamon-%{version}
+
+%{__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
+# remove mintlocale im from settings
+%{__sed} -i -e 's@mintlocale im@mintlocale_im_removed@g'
files%{_datadir}/%{name}/%{name}-settings/%{name}-settings.py
+# fix hard coded paths
+%ifarch ppc64
+%{__sed} -i -e
's@%{_prefix}/lib/%{name}-control-center@%{_prefix}/lib64/%{name}-control-center@g'
\
+ files%{_datadir}/%{name}/%{name}-settings/bin/capi.py
+%endif
+
+# Fix rpmlint errors
+for file in files%{_datadir}/%{name}/%{name}-settings/bin/*.py
files%{_datadir}/%{name}/%{name}-looking-glass/*.py \
+ files%{_datadir}/%{name}/%{name}-settings/modules/cs_{applets,desklets}.py; do
+ chmod a+x $file
+done
+chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py
+
+
+NOCONFIGURE=1 ./autogen.sh
+
+
+%build
+%configure \
+ --disable-static \
+ --disable-schemas-compile \
+ --disable-silent-rules \
+ --enable-introspection=yes \
+ --enable-compile-warnings=no
+
+%make_build
+
+
+%install
+%make_install
+
+# Remove static libs and libtool crap
+%{_bindir}/find %{buildroot}%{_libdir} -name '*.a' -print -delete
+%{_bindir}/find %{buildroot}%{_libdir} -name '*.la' -print -delete
+
+# install polkit autostart desktop file
+%{__install} --target-directory=%{buildroot}%{_datadir}/applications \
+ -Dpm 0644 %{SOURCE1}
+
+# install common gschema override
+%{__install} --target-directory=%{buildroot}%{_datadir}/glib-2.0/schemas \
+ -Dpm 0644 %{SOURCE2}
+
+# install gschema-override for apps
+%{__sed} -e 's!@pkg_manager(a)!org.mageia.dnfdragora.desktop!g' \
+ < %{SOURCE3} >
%{buildroot}%{_datadir}/glib-2.0/schemas/10_%{name}-apps.gschema.override
+
+# install gschema-override for wallpaper
+%{__cat} >>
%{buildroot}%{_datadir}/glib-2.0/schemas/10_%{name}-wallpaper.gschema.override <<
EOF
+[org.cinnamon.desktop.background]
+%if 0%{?fedora}
+%if 0%{?fedora} < %{rawhide_version}
+picture-uri='file:///usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}.xml'
+%else
+picture-uri='file:///usr/share/backgrounds/f%{release_version}/default/f%{release_version}.xml'
+%endif
+%else
+picture-uri='file:///usr/share/backgrounds/default.xml'
+%endif
+EOF
+
+# Provide symlink for the default menu icon.
+%{__ln_s} %{_datadir}/pixmaps/fedora-logo-sprite.svg
%{buildroot}%{_datadir}/%{name}/theme/menu.svg
+
+# Provide symlink for the background-propeties.
+%{__ln_s} %{_datadir}/gnome-background-properties
%{buildroot}%{_datadir}/%{name}-background-properties
+
+
+%check
+%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
+
+%files
+%doc README.rst AUTHORS
+%license COPYING
+%{_bindir}/*
+%config(noreplace) %{_sysconfdir}/xdg/menus/*
+%{_datadir}/applications/*
+%{_datadir}/dbus-1/services/org.Cinnamon.*.service
+%{_datadir}/desktop-directories/*
+%{_datadir}/glib-2.0/schemas/*
+%{_datadir}/%{name}-session/sessions/*
+%{_datadir}/icons/hicolor/*/*/*.svg
+%{_datadir}/polkit-1/actions/org.%{name}.settings-users.policy
+%{_datadir}/xsessions/*
+%{_datadir}/%{name}/
+%{_datadir}/%{name}-background-properties
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_mandir}/man1/*
+
+
+%files devel-doc
+%doc %{_datadir}/gtk-doc/html/*/
+
+
+%changelog
+* Sat Nov 03 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.0-1
+- Update to 4.0.0 release
+
+* Sun Oct 07 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.9-2
+- Drop EPEL/RHEL support
+
+* Fri Sep 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.9-1
+- Update to 3.8.9 release
+
+* Tue Aug 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.8-2
+- Update for f29-backgrounds
+
+* Sun Jul 22 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.8-1
+- Update to 3.8.8 release
+- Fix wifi connection issue
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.8.7-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 05 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.7-1
+- Update to 3.8.7 release
+
+* Fri Jun 08 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.4-1
+- Update to 3.8.4 release
+
+* Mon May 21 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.3-1
+- Update to 3.8.3 release
+
+* Sun May 06 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.2-1
+- Update to 3.8.2 release
+
+* Sat May 05 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.1-3
+- Use rebased libnm patch
+
+* Wed May 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.1-2
+- Update required versions
+
+* Tue May 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.1-1
+- Update to 3.8.1 release
+- Revert all 3.8.1 network applet changes as they conflict with the libnm patch
+
+* Mon Apr 30 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.0-4
+- Fix possible crash in system tray on start up
+
+* Sat Apr 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.0-3
+- Revert "Remove requires caribou as it has been retired (f28+)."
+
+* Wed Apr 25 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.0-2
+- Remove requires caribou as it has been retired (f28+).
+
+* Tue Apr 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.0-1
+- Update to 3.8.0 release
+
+* Mon Apr 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.7.20180328git8262210
+- update to git snapshot
+
+* Fri Mar 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.6.20180316git45339e8
+- update to git snapshot
+
+* Fri Mar 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.5.20180316gitd7e0764
+- update to git snapshot
+
+* Mon Mar 12 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.4.20180309gitd4679f7
+- update to git snapshot
+
+* Tue Feb 20 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.3.20180219gitaee5bb1
+- update to git snapshot
+- Fix rpmlint errors
+
+* Mon Feb 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.2.20180219git9a0ffdb
+- update to git snapshot
+- Switch to python3 deps for fedora (epel needs changing)
+
+* Thu Feb 15 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
3.6.8-0.1.20180209git4b2bc05
+- update to git snapshot
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.7-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.6.7-4
+- Remove obsolete scriptlets
+
+* Fri Dec 29 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.7-3
+- Adjust Requires for default backgrounds packages
+
+* Thu Dec 28 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.7-2
+- Replace Arc-Dark theme with Mint-Y-Dark theme
+- Require cinnamon-themes to satisfy all theme dependencies
+
+* Mon Dec 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.6.7-1
+- update to 3.6.7 release
+
+* Thu Dec 07 2017 Bjrn Esser - 3.6.6-12
+- Revert: Switch to libnm on Fedora 25
+
+* Mon Dec 04 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-11
+- Revert: Switch to libnm on EPEL7
+
+* Wed Nov 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.6.6-10
+- Fix wifi connection issue
+
+* Sun Nov 26 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-9
+- Switch to libnm on all Fedora releases and EPEL7
+
+* Sun Nov 26 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.6.6-8
+- Remove unused 'Input Method' from settings
+
+* Sun Nov 26 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.6.6-7
+- Update patch from upstream to switch to libnm
+
+* Sat Nov 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-6
+- Updated common gschema
+
+* Sat Nov 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-5
+- Fix Requires for EPEL
+
+* Sat Nov 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-4
+- Update patch for Red Hat based distros
+- Add symlinks for menu icon and background-propeties
+- Simplify and unify handling of gsettings
+- General packaging improvements
+
+* Sat Nov 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-3
+- Update patch from new pull-request
+
+* Sat Nov 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-2
+- Update patch for Fedora icon in menu
+
+* Sat Nov 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.6-1
+- update to 3.6.6 release
+
+* Tue Nov 21 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.5-2
+- Revert from Tilix to Gnome Terminal
+
+* Mon Nov 20 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.5-1
+- update to 3.6.5 release
+
+* Mon Nov 20 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.4-1
+- update to 3.6.4 release
+
+* Fri Nov 17 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.3-2
+- Add patch from upstream to switch to libnm
+- Rewrite Debian downstream patch for libnm
+- Realign other patches
+
+* Fri Nov 17 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.3-1
+- update to 3.6.3 release
+
+* Thu Nov 16 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.2-3
+- Adaptions for EPEL7
+
+* Wed Nov 15 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.6.2-2
+- Add Requires: python2-xapps-overrides%%{?_isa}
+
+* Mon Nov 13 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.6.2-1
+- update to 3.6.2 release
+
+* Tue Oct 24 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.6.0-1
+- update to 3.6.0 release
+
+* Tue Sep 19 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-16
+- Update for F27 backgrounds
+
+* Fri Sep 08 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-15
+- Add online-accounts to cinnamon-settings
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-14
+- Fully remove sharing
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-13
+- Remove icon for sharing from patches
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-12
+- Preserve mode of files when changing hashbang
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-11
+- Fix hashbang in regex
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-10
+- Use Python 2 on EPEL
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-9
+- Small fix for gnome-terminal on EPEL7
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-8
+- Revert to gnome-terminal on EPEL7
+
+* Thu Aug 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-7
+- Add patch to adjust cinnamon-settings-apps for EPEL7
+
+* Wed Aug 30 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-6
+- Adjustments for EPEL7
+
+* Sat Aug 26 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-5
+- Replace gnome-terminal with tilix in favorites and panel
+
+* Fri Aug 25 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.6-4
+- Add gschema override for trilix
+- Drop support for fc24
+- Add support for fc28
+
+* Thu Aug 10 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.6-3
+- revert last commit
+
+* Wed Aug 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.6-2
+- rebuild for nemo.desktop name change
+
+* Wed Aug 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.6-1
+- update to 3.4.6 release
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.4-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.4-3
+- Add build requires mesa-libGL-devel
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.4-1
+- update to 3.4.4 release
+
+* Wed Jun 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.2-1
+- update to 3.4.2 release
+
+* Wed May 31 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.1-2
+- Revert 'Remove network-applet changes'
+
+* Tue May 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.1-1
+- update to 3.4.1 release
+
+* Thu May 11 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.0-3
+- Updated patch, fixing gir
+- Remove network-applet until it works fine with libnm
+
+* Wed May 10 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.4.0-2
+- Add patch to port to libnm-1.2 (rhbz#1413610)
+
+* Thu May 04 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.0-1
+- update to 3.4.0 release
+
+* Wed Apr 26 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.2.20170426git067e1da
+- update to git snapshot
+
+* Thu Apr 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.4.0-0.1.20170420git886147d
+- update to git snapshot
+
+* Sat Apr 08 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-18
+- Conditionalize discouraged scriptlets
+
+* Sat Apr 08 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-17
+- Enable startup-animation by default
+
+* Fri Apr 07 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-16
+- Use lightdm-settings instead of lightdm-gtk-greeter-settings
+
+* Fri Mar 24 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-15
+- Make blueberry-applet a weak dependency (rhbz#1429404)
+- Change default wallpaper for fc26+
+- Add gschema for fc27+
+
+* Sun Feb 19 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-14
+- Add applet from blueberry by default
+
+* Tue Feb 14 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-13
+- Require system-logos instead of fedora-logos (rhbz#1421952)
+
+* Sun Feb 05 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-12
+- Use dnfdragora for package-management in F26+
+
+* Sat Feb 04 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-11
+- Add new package-managers to favorites
+
+* Fri Feb 03 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-10
+- Update Patch9 to use a vector-logo instead of a fixed-size png
+
+* Wed Feb 01 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-9
+- Remove unneded Requires: gnome-python2-gconf
+
+* Wed Feb 01 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-8
+- Change hard requires on xawtv to a weak one and add
+ a comment for which purpose it would be useful
+
+* Tue Jan 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-7
+- Add upstream-patch to fix a segmentation fault that happened in
+ sound applet when menu animations were disabled (rhbz#1396110)
+
+* Tue Jan 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-6
+- Adapt Patch9, to not change the value of the default-setting
+
+* Tue Jan 31 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-5
+- Use 'Noto Sans'-font for screensaver, too
+
+* Mon Jan 30 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-4
+- Use new theming for F24+ too
+
+* Sun Jan 29 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-3
+- Add patch to use fedora-icon as default menu-icon
+
+* Sun Jan 29 2017 Bjrn Esser <besser82(a)fedoraproject.org> - 3.2.8-2
+- Make Cinnamon look more 'Minty' by default
+ - Use dark arc-theme with mint-y-icons and google-noto-sans-fonts
+ on Fedora 26+ and (possibly) RHEL 8+
+
+* Sat Jan 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.8-1
+- update to 3.2.8 release
+- cinnamon-settings: use blueberry instead of blueman
+- add build requires gnome-bluetooth-devel
+
+* Sat Dec 31 2016 Bjrn Esser <bjoern.esser(a)gmail.com> - 3.2.7-3
+- Add upstream patch for tuples in Python-3.6
+- Remove hack for python-3.6
+- Clean trailing whitspaces
+- Drop unused patches
+
+* Thu Dec 29 2016 leigh <leigh123linux(a)googlemail.com> - 3.2.7-2
+- add hack for python-3.6 (rhbz#1408987)
+
+* Thu Dec 22 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.7-1
+- update to 3.2.7 release
+
+* Wed Dec 14 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.6-1
+- update to 3.2.6 release
+
+* Tue Dec 13 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.5-2
+- Patch to mitigate memory leak
+
+* Mon Dec 12 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.5-1
+- update to 3.2.5 release
+
+* Sun Dec 11 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.4-1
+- update to 3.2.4 release
+
+* Sat Dec 10 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.3-2
+- tweak fallback session
+- drop mate-panel as tint2 seems a better fit
+- replace metacity with openbox as it does
+ window decoration and a simple menu
+
+* Sat Dec 10 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.3-1
+- update to 3.2.3 release
+
+* Sun Nov 27 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.2-3
+- add requires wget (rhbz#1402335)
+- use mate-panel for cinnamon fallback (for F25 and up)
+
+* Fri Nov 25 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.2-2
+- change default settings for two and three finger click,
+ disabling them enables clickpad button areas to function
+
+* Wed Nov 23 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.2-1
+- update to 3.2.2 release
+
+* Tue Nov 08 2016 leigh scott <leigh123linux(a)googlemail.com> - 3.2.1-1
+- update to 3.2.1 release
+
+* Mon Nov 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.0-2
+- add requires xapps (for keyboard applet)
+
+* Mon Nov 07 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.0-1
+- update to 3.2.0 release
+
+* Sun Oct 02 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.7-3
+- Use F25 background
+
+* Thu Aug 25 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.7-2
+- add sharing to cinnamon-settings (needs control-center to work)
+
+* Thu Aug 11 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.7-1
+- update to 3.0.7 release
+- set a priority for the gsettings override file
+- replace python-opencv with xawtv requires
+
+* Fri Jun 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.6-1
+- update to 3.0.6 release
+
+* Sun Jun 05 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.5-2
+- Fix missing bluetooth icon
+
+* Tue May 31 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.5-1
+- update to 3.0.5 release
+
+* Tue May 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.4-1
+- update to 3.0.4 release
+
+* Sun May 22 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-1
+- update to 3.0.3 release
+
+* Tue May 17 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.2-2
+- add settings for gtk overlay scrollbars and dark theme variant
+
+* Mon May 16 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.2-1
+- update to 3.0.2 release
+
+* Sun May 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.1-1
+- update to 3.0.1 release
+
+* Sun Apr 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-1
+- update to 3.0.0 release
+
+* Mon Apr 04 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.8-2
+- fix epel requires
+
+* Sat Apr 02 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.8-1
+- update to 2.8.8 release
+
+* Wed Mar 09 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.7-1
+- update to 2.8.7 release
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.6-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Jan 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.6-2
+- Switch to adwaita theme for F24 as mclasen has broken gtk3 again
+
+* Wed Dec 02 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.6-1
+- update to 2.8.6 release
+
+* Wed Dec 02 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.5-3
+- fix missing requires for cinnamon-settings
+
+* Sat Nov 21 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.5-2
+- redo cinnamon-settings-apps patch
+
+* Sat Nov 21 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.5-1
+- update to 2.8.5 release
+
+* Mon Nov 09 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.3-2
+- rebuilt
+
+* Mon Nov 09 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.3-1
+- update to 2.8.3 release
+
+* Sat Oct 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.2-1
+- update to 2.8.2 release
+
+* Mon Oct 26 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.1-1
+- update to 2.8.1 release
+
+* Thu Oct 22 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.0-1
+- update to 2.8.0 release
+
+* Wed Sep 09 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-10
+- fix deprecated schema warnings
+
+* Fri Aug 28 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-9
+- add patch to fix glib2 regression
+
+* Tue Aug 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-8
+- fix deprecation warning on cinnamon-settings
+
+* Sun Aug 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-7
+- try again
+
+* Sun Aug 16 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-6
+- change back to gnome icon theme
+
+* Sun Aug 09 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-5
+- remove .la file and filter requires
+
+* Fri Aug 07 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-4
+- revert upstream flag commit (keyboard applet)
+
+* Wed Jul 29 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-3
+- add f23 schema override
+
+* Mon Jul 20 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-2
+- remove nautilus from menu
+- remove other useless crap from menu
+
+* Sun Jul 12 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.13-1
+- update to 2.6.13 release
+
+* Tue Jul 07 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.12-2
+- fix gi import versions
+
+* Wed Jul 01 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.12-1
+- update to 2.6.12 release
+
+* Sat Jun 27 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.11-2
+- add required cjs version 2.6.2
+
+* Sat Jun 27 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.11-1
+- update to 2.6.11 release
+- spec file clean up
+
+* Sat Jun 20 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.8-3
+- remove requires blueman
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.6.8-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Jun 14 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.8-1
+- update to 2.6.8 release
+
+* Sat Jun 13 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.7-4
+- remove the bluetooth buildrequires for F19
+- make themes work on F20 (due to old gi version)
+
+* Thu Jun 11 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.7-3
+- tweak override schema
+
+* Sat Jun 06 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.7-2
+- add requires keybinder3 (bz 1227997)
+
+* Tue Jun 02 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.7-1
+- update to 2.6.7 release
+
+* Mon Jun 01 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.6-1
+- update to 2.6.6 release
+
+* Fri May 29 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.4-1
+- update to 2.6.4 release
+
+* Wed May 27 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.3-1
+- update to 2.6.3 release
+
+* Sat May 23 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.2-2
+- Add upstream fixes
+
+* Thu May 21 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.2-1
+- update to 2.6.2 release
+
+* Thu May 21 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.1-2
+- add devel-doc subpackage
+
+* Wed May 20 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.1-1
+- update to 2.6.1 release
+
+* Wed May 20 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.0-1
+- update to 2.6.0 release
+
+* Fri May 15 2015 Leigh Scott <leigh123linux(a)googlemail.com> -
2.5.0-0.2.git32284cb
+- update to git snapshot
+
+* Tue May 05 2015 Leigh Scott <leigh123linux(a)googlemail.com> -
2.5.0-0.1.gitc0ea9e7
+- update to git snapshot
+
+* Sun Apr 26 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.8-1
+- update to 2.4.8
+
+* Sat Apr 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.7-4
+- use new gnome-terminal desktop file name
+
+* Sat Apr 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.7-3
+- add br zukitwo-metacity-theme
+
+* Sat Apr 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.7-2
+- tweak schema overrides
+
+* Thu Apr 02 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.7-1
+- update to 2.4.7
+
+* Tue Feb 10 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.6-3
+- add requires python-inotify for looking glass
+
+* Sat Jan 24 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.6-2
+- switch back to zukitwo theme
+
+* Mon Jan 19 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.6-1
+- update to 2.4.6
+- drop upstream patches
+
+* Sun Jan 18 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.5-3
+- change to nimbus icon theme
+- add some upstream fixes
+
+* Tue Dec 09 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.5-2
+- Fix slideshow for user added pictures (bz 1172008)
+
+* Tue Dec 02 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.5-1
+- update to 2.4.5
+- attempt to fix brightness control detection
+- drop requires gstreamer-python
+
+* Wed Nov 26 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.4-2
+- remove session timeout settings from general
+
+* Sun Nov 23 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.4-1
+- update to 2.4.4
+
+* Tue Nov 18 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.2-2
+- add patch to set default panel launchers
+- disable the stupid startup-animation effect
+
+* Wed Nov 12 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.2-1
+- update to 2.4.2
+
+* Sat Nov 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.1-2
+- switch to use xml backgrounds
+
+* Sat Nov 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.1-1
+- update to 2.4.1
+
+* Fri Oct 31 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.0-1
+- update to 2.4.0
+
+* Fri Oct 10 2014 Leigh Scott <leigh123linux(a)googlemail.com> -
2.4.0-0.4.gitea748a2
+- update to latest git
+
+* Wed Oct 01 2014 Leigh Scott <leigh123linux(a)googlemail.com> -
2.4.0-0.3.git8304e57
+- patch for some of the gtk-3.14 changes
+
+* Tue Sep 30 2014 Leigh Scott <leigh123linux(a)googlemail.com> -
2.4.0-0.2.git8304e57
+- add requires gstreamer-python (needed for c-s 'account details')
+
+* Tue Sep 30 2014 Leigh Scott <leigh123linux(a)googlemail.com> -
2.4.0-0.1.git8304e57
+- update to latest git
+
+* Sat Sep 06 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.16-3
+- Change theme to Adwaita till the other themes are fixed
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.2.16-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Aug 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.16-1
+- update to 2.2.16
+- drop upstream patches
+
+* Sun Aug 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-9
+- fix cinnamon-settings background with python-pillow-2.5
+
+* Sun Aug 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-8
+- revert power applet patch (fixed in cinnamon-settings-daemon)
+
+* Tue Jul 29 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-7
+- Cinnamon Settings User: Don't print passwords to stdout
+
+* Tue Jul 22 2014 Kalev Lember <kalevlember(a)gmail.com> - 2.2.14-6
+- Rebuilt for gobject-introspection 1.41.4
+
+* Thu Jul 17 2014 Rex Dieter <rdieter(a)fedoraproject.org> 2.2.14-5
+- rebuild (for pulseaudio, bug #1117683)
+
+* Wed Jul 16 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-4
+- fix power applet with upower-0.99
+
+* Tue Jul 08 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-3
+- backport some menu fixes
+
+* Wed Jul 02 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-2
+- add network applet patch for nm-applet changes
+
+* Fri Jun 27 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.14-1
+- update to 2.2.14
+- Touchpad support: Added support for two and three finger clicks
+
+* Fri Jun 06 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.13-5
+- modify set_wheel patch
+
+* Tue Jun 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.13-4
+- fix files from being listed twice
+
+* Tue Jun 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.13-3
+- rebuilt
+
+* Fri May 30 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.13-2
+- add logout sound to schema override
+
+* Mon May 26 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.13-1
+- update to 2.2.13
+- give cinnamon a rpmlint birthday
+
+* Tue May 20 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.10-1
+- update to 2.2.10
+
+* Sun May 11 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.7-1
+- update to 2.2.7
+
+* Sat May 10 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.6-1
+- update to 2.2.6
+
+* Sat May 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.5-1
+- update to 2.2.5
+- validate all the cinnamon-settings desktop files
+
+* Fri May 02 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.4-1
+- update to 2.2.4
+
+* Mon Apr 21 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.3-3
+- add requires mintlocale
+
+* Tue Apr 15 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.3-2
+- add requires gucharmap
+- add required network packages for network applet
+- change to gstreamer1
+
+* Mon Apr 14 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.3-1
+- update to 2.2.3
+
+* Sat Apr 12 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.0-1
+- update to 2.2.0
+
+* Wed Apr 02 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-16
+- add patch to disable xinput for cinnamon only (bz 873434)
+
+* Wed Mar 05 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-15
+- Fix desktop file editor
+
+* Thu Feb 20 2014 Kalev Lember <kalevlember(a)gmail.com> - 2.0.14-14
+- Rebuilt for cogl soname bump
+
+* Mon Feb 10 2014 Peter Hutterer <peter.hutterer(a)redhat.com> - 2.0.14-13
+- Rebuild for libevdev soname bump
+
+* Sun Feb 09 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-12
+- cinnamon-settings-users: set wheel instead of sudo
+
+* Fri Feb 07 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-11
+- rebuilt for new cogl .so version
+
+* Wed Jan 22 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-10
+- use autosetup for prep
+- trim spec file changelog
+
+* Tue Jan 14 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-9
+- change pexpect requires for epel7
+
+* Tue Jan 14 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-8
+- Add conditionals for epel7
+- Add redhat overrides schema file
+
+* Sun Dec 22 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-7
+- Remove bluetooth for F20 as well
+
+* Sun Dec 22 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-6
+- Patch calendar applet for upower changes
+- Remove bluetooth
+
+* Sat Dec 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-5
+- readd requires python-pexpect for ARM
+
+* Tue Dec 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-4
+- add requires gnome-themes
+
+* Mon Dec 02 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-3
+- tweak gschema override again
+
+* Tue Nov 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-2
+- add compile fix for F21
+
+* Tue Nov 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.14-1
+- update to 2.0.14
+- remove conflicts wallpapoz (bz 1029554)
+- remove nm-applet from autostart (bz 1034887)
+
+* Sun Nov 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-3
+- patch to restore panel icon bounce
+
+* Sun Nov 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-2
+- set default theme to zukitwo
+
+* Sun Nov 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.13-1
+- update to 2.0.13
+- tweak gschema override again
+
+* Thu Nov 14 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-2
+- add conflicts wallpapoz (bz 1029554)
+
+* Mon Nov 11 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.12-1
+- update to 2.0.12
+- tweak gschema override again
+
+* Sun Nov 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.11-1
+- update to 2.0.11
+- remove upstream patch
+- tweak gschema override
+
+* Tue Nov 05 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-2
+- add patch to draw desktop background immediately
+
+* Sun Nov 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.10-1
+- update to 2.0.10
+
+* Fri Nov 01 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.8-1
+- update to 2.0.8
+- add autostart file for polkit
+
+* Wed Oct 30 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.7-1
+- update to 2.0.7
+
+* Fri Oct 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.6-1
+- update to 2.0.6
+
+* Thu Oct 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.5-1
+- update to 2.0.5
+
+* Fri Oct 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.3-1
+- update to 2.0.3
+
+* Thu Oct 17 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.2-3
+- add custom nm-applet file as the stock one is set to NotShowIn Gnome
+
+* Thu Oct 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.2-2
+- add policy file for "users and groups" setting
+- add nm-applet to required components
+- add upstream commits
+
+* Wed Oct 09 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.2-1
+- update to 2.0.2
+- drop upstream patch
+
+* Mon Oct 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.2-4
+- revert ST changes
+
+* Mon Oct 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.2-3
+- patch with upstream commits for
+- lightdm and a
+- ST crash on user switching
+
+* Tue Oct 01 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.2-2
+- set some sound defaults
+
+* Mon Sep 30 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.2-1
+- update to 1.9.2
+
+* Tue Sep 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.27.git8a53cfb
+- use the right conditional (too much beer)
+
+* Tue Sep 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.26.git8a53cfb
+- re-add bluetooth support for F19
+
+* Tue Sep 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.25.git8a53cfb
+- Remove ExcludeArch for ARM
+- remove the python-pexpect requires for ARM
+
+* Sat Sep 21 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.24.git8a53cfb
+- patch to add input-source switching keybindings
+
+* Thu Sep 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.23.git8a53cfb
+- patch keyboard applet (also fixes input-switching)
+
+* Wed Sep 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.22.git8a53cfb
+- update to latest git
+
+* Wed Sep 11 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.21.git2d1ac4d
+- ExcludeArch for ARM due to missing dep (python-pexpect)
+
+* Sun Aug 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.20.git2d1ac4d
+- update to latest git
+- Change buildrequires to cinnamon-desktop-devel
+
+* Sat Aug 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.19.gitd4305ab
+- add requires cinnamon-translations
+
+* Fri Aug 23 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.18.gitd4305ab
+- update to latest git
+- adjust for new cinnamon-translations package
+
+* Thu Aug 22 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.17.git8bdd61f
+- rebuilt
+
+* Tue Aug 20 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.16.git8bdd61f
+- update to latest git
+- drop upstream patches
+
+* Sat Aug 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.15.git19b4b43
+- redo gsettings patch
+
+* Sat Aug 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.14.git19b4b43
+- update to latest git
+- drop upstream fixes
+
+* Sat Aug 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.13.gita1dd2a1
+- add patch to remove obsolete gsettings for menu and button icon till upstream fixes it
+
+* Fri Aug 09 2013 Kalev Lember <kalevlember(a)gmail.com> - 1.9.2-0.12.gita1dd2a1
+- Rebuilt for cogl 1.15.4 soname bump
+
+* Mon Jul 29 2013 leigh <leigh123linux(a)googlemail.com> - 1.9.2-0.11.gita1dd2a1
+- fix bluetooth patch again
+
+* Mon Jul 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.10.gita1dd2a1
+- remove some fixes and upstream patches
+- redo bluetooth patch
+
+* Sun Jul 28 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.9.git39fc3a7
+- patch to use cinnamon-control-center bluetooth
+
+* Sun Jul 28 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.8.git39fc3a7
+- add virtual provides desktop-notification-daemon
+- fix missing settings-users menu icon
+
+* Sat Jul 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.7.git39fc3a7
+- fix icon path for user and groups
+
+* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.6.git39fc3a7
+- drop screensaver patch
+
+* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.5.git39fc3a7
+- update to latest git
+- fix panel-edit crash
+
+* Thu Jul 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.4.git435e7a2
+- Fix automake warnings
+
+* Thu Jul 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.3.git435e7a2
+- update to latest git
+- fix default theme
+- use fedora firewall in settings
+- use beesu for user accounts instead of gksu
+
+* Wed Jul 24 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.2.gitc321232
+- fix control-center settings on x86_64
+- drop clutter xinput patch
+- add missing requirements for cinnamon-settings
+- redo screensaver patch to enable/disable lock password
+
+* Tue Jul 23 2013 Leigh Scott <leigh123linux(a)googlemail.com> -
1.9.2-0.1.gitc321232
+- rebase for cinnamon next
+
+* Tue Jul 23 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.1-19
+- fix permissions on cinnamon3d
+
+* Mon Jul 22 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.1-18
+- fix permissions on cinnamon-launcher-creator
+
+* Tue Jul 16 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-17
+- add patch to fix cinnamon-menu-editor
+
+* Fri Jul 12 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-16
+- remove GC from cinnamon-global.c
+
+* Wed Jul 10 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-15
+- fix input-source-switcher autostart
+
+* Wed Jul 10 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-14
+- fix input-source-switcher
+
+* Fri Jun 14 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-13
+- spec file clean up
+
+* Thu Jun 13 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-12
+- Fix automount
+
+* Thu Jun 13 2013 Dan Hork <dan[at]danny.cz> - 1.9.1-11
+- fix build on s390(x) - no wacom there
+
+* Wed Jun 12 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-10
+- fix the screensaver tab in cinnamon-settings
+
+* Sun Jun 09 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-9
+- add requires gnome-screensaver
+
+* Sun Jun 09 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-8
+- Fix media keys
+
+* Thu Jun 06 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-7
+- change how the screen lock autostarts
+
+* Thu Jun 06 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-6
+- add requires nemo
+
+* Thu Jun 06 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-5
+- autostart nemo differently so we dont squash nautilus
+
+* Thu Jun 06 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-4
+- Patch so screen lock uses gnome-screensaver
+- add gnome-screensaver autostart files
+- add patch to remove obex file transfer
+
+* Tue Jun 04 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.1-3
+- add cinnamon-fedora.gschema.override file
+
+* Tue Jun 04 2013 leigh scott <leigh123linux(a)googlemail.com> - 1.9.1-2
+- patch for mozjs-17 changes
+
+* Sat Jun 01 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.9.1-1
+- Update to version 1.9.1
+
+* Sat Jun 01 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1.8.7-2
+- Re-add build requires versions
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 1ac3aa0..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Not enough time to maintain
diff --git a/default_panal_launcher.patch b/default_panal_launcher.patch
new file mode 100644
index 0000000..e751b8f
--- /dev/null
+++ b/default_panal_launcher.patch
@@ -0,0 +1,13 @@
+Index:
Cinnamon-3.6.6/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/settings-schema.json
+===================================================================
+---
Cinnamon-3.6.6.orig/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/settings-schema.json
++++
Cinnamon-3.6.6/files/usr/share/cinnamon/applets/panel-launchers(a)cinnamon.org/settings-schema.json
+@@ -5,7 +5,7 @@
+ },
+ "launcherList": {
+ "type": "generic",
+- "default": ["firefox.desktop",
"org.gnome.Terminal.desktop", "nemo.desktop"]
++ "default": ["firefox.desktop",
"mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop",
"nemo.desktop"]
+ },
+ "allow-dragging": {
+ "type": "switch",
diff --git a/polkit-cinnamon-authentication-agent-1.desktop
b/polkit-cinnamon-authentication-agent-1.desktop
new file mode 100644
index 0000000..c0cccca
--- /dev/null
+++ b/polkit-cinnamon-authentication-agent-1.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Comment=PolicyKit Authentication Agent
+Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=X-Cinnamon;
+X-GNOME-AutoRestart=true
diff --git a/remove_crap_from_menu.patch b/remove_crap_from_menu.patch
new file mode 100644
index 0000000..589c826
--- /dev/null
+++ b/remove_crap_from_menu.patch
@@ -0,0 +1,53 @@
+Index: Cinnamon-3.6.6/files/etc/xdg/menus/cinnamon-applications.menu
+===================================================================
+--- Cinnamon-3.6.6.orig/files/etc/xdg/menus/cinnamon-applications.menu
++++ Cinnamon-3.6.6/files/etc/xdg/menus/cinnamon-applications.menu
+@@ -26,6 +26,8 @@
+ applications here -->
+ <Not><Category>Accessibility</Category></Not>
+ <Not><Category>System</Category></Not>
++
<Not><Filename>org.gnome.Nautilus.desktop</Filename></Not>
++ <Not><Filename>yelp.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessories -->
+@@ -38,6 +40,7 @@
+ <And>
+ <Category>Accessibility</Category>
+ <Not><Category>Settings</Category></Not>
++ <Not><Filename>onboard.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessibility -->
+@@ -136,6 +139,9 @@
+ <Not><Category>Core</Category></Not>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
++ <Not><Filename>onboard.desktop</Filename></Not>
++
<Not><Filename>redhat-usermount.desktop</Filename></Not>
++
<Not><Filename>fedora-release-notes.webapp.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Other -->
+@@ -158,6 +164,11 @@
+ <And>
+ <Category>Settings</Category>
+ <Not><Category>System</Category></Not>
++
<Not><Filename>onboard-settings.desktop</Filename></Not>
++ <Not><Filename>redhat-userinfo.desktop</Filename></Not>
++
<Not><Filename>redhat-userpasswd.desktop</Filename></Not>
++
<Not><Filename>system-config-users.desktop</Filename></Not>
++
<Not><Filename>xscreensaver-properties.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu>
+@@ -176,6 +187,9 @@
+ <And>
+ <Category>System</Category>
+ <Not><Category>Settings</Category></Not>
++
<Not><Filename>redhat-usermount.desktop</Filename></Not>
++
<Not><Filename>system-config-users.desktop</Filename></Not>
++
<Not><Filename>fedora-release-notes.webapp.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End System Settings -->
diff --git a/replace-metacity-with-openbox.patch b/replace-metacity-with-openbox.patch
new file mode 100644
index 0000000..35ceaf4
--- /dev/null
+++ b/replace-metacity-with-openbox.patch
@@ -0,0 +1,12 @@
+--- Cinnamon-3.8.0.orig/files/usr/bin/cinnamon-launcher
++++ Cinnamon-3.8.0/files/usr/bin/cinnamon-launcher
+@@ -11,7 +11,7 @@
+ gi.require_version('Gtk', '3.0') # noqa
+ from gi.repository import Gtk
+
+-FALLBACK_COMMAND = "metacity"
++FALLBACK_COMMAND = "openbox"
+ FALLBACK_ARGS = ("--replace",)
+
+ gettext.install("cinnamon", "/usr/share/locale")
+
diff --git a/revert_25aef37.patch b/revert_25aef37.patch
new file mode 100644
index 0000000..1679b54
--- /dev/null
+++ b/revert_25aef37.patch
@@ -0,0 +1,30 @@
+Index:
Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+===================================================================
+---
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 @@
+ print(detail)
+
+ def _on_entry_changed(self, entry):
+- name = entry.get_text()
+- if " " in name or name.lower() != name:
++ if " " in entry.get_text():
+ entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
"dialog-warning-symbolic")
+- entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The
group name cannot contain upper-case or space characters"))
++ entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The
group name cannot contain space characters"))
+ self.set_response_sensitive(Gtk.ResponseType.OK, False)
+ else:
+ entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
+@@ -367,9 +366,9 @@
+ fullname = self.realname_entry.get_text()
+ username = self.username_entry.get_text()
+ valid = True
+- if re.search('[^a-z0-9_.-]', username):
++ if " " in username:
+ self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
"dialog-warning-symbolic")
+- self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY,
_("Invalid username"))
++ self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY,
_("The username cannot contain space characters"))
+ valid = False
+ else:
+ self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
None)
+
diff --git a/set_fedora_menu_icon.patch b/set_fedora_menu_icon.patch
new file mode 100644
index 0000000..e9c06b6
--- /dev/null
+++ b/set_fedora_menu_icon.patch
@@ -0,0 +1,19 @@
+--- a/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/settings-schema.json
++++ b/files/usr/share/cinnamon/applets/menu(a)cinnamon.org/settings-schema.json
+@@ -40,13 +40,13 @@
+ },
+ "menu-custom" : {
+ "type" : "switch",
+- "default" : false,
++ "default" : true,
+ "description" : "Use a custom icon and label",
+ "tooltip" : "Check this to specify a custom icon and label"
+ },
+ "menu-icon" : {
+ "type" : "iconfilechooser",
+- "default" : "/usr/share/cinnamon/theme/menu-symbolic.svg",
++ "default" : "/usr/share/cinnamon/theme/menu.svg",
+ "description" : "Icon",
+ "tooltip" : "Select an icon to show in the panel.",
+ "dependency" : "menu-custom",
+
diff --git a/set_wheel.patch b/set_wheel.patch
new file mode 100644
index 0000000..32dae07
--- /dev/null
+++ b/set_wheel.patch
@@ -0,0 +1,59 @@
+Index:
Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+===================================================================
+---
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 PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask, parent = None):
++ def __init__ (self, user, password_mask, parent = None):
+ super(PasswordDialog, self).__init__(None, parent)
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -224,14 +223,7 @@
+ def change_password(self):
+ newpass = self.new_password.get_text()
+ self.user.set_password(newpass, "")
+- mask = self.group_mask.get_text()
+- if "nopasswdlogin" in mask:
+- subprocess.call(["gpasswd", "-d",
self.user.get_user_name(), "nopasswdlogin"])
+- mask = mask.split(", ")
+- mask.remove("nopasswdlogin")
+- mask = ", ".join(mask)
+- self.group_mask.set_text(mask)
+- 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 @@
+ model, treeiter = self.users_treeview.get_selection().get_selected()
+ if treeiter != None:
+ user = model[treeiter][INDEX_USER_OBJECT]
+- dialog = PasswordDialog(user, self.password_mask, self.groups_label,
self.window)
++ dialog = PasswordDialog(user, self.password_mask, self.window)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -839,11 +831,11 @@
+ pixbuf =
GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png",
48, 48)
+ description = "<b>%s</b>\n%s" % (fullname, username)
+ piter = self.users.append(None, [new_user, pixbuf, description])
+- # Add the user to his/her own group and sudo if Administrator was selected
++ # Add the user to his/her own group and wheel if Administrator was selected
+ if dialog.account_type_combo.get_active() == 1:
+- subprocess.call(["usermod", username, "-G",
"%s,sudo,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G",
"%s,wheel" % username])
+ else:
+- subprocess.call(["usermod", username, "-G",
"%s,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G",
"%s" % username])
+ self.load_groups()
+ dialog.destroy()
+
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..5cc7ee3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (cinnamon-4.0.0.tar.gz) =
c827211aa449e6bb5c8a39b8f6711df39eefb956572900b8c90437db4e17f7c13a9e5772504ca4c689f6271ecfa22d5f453c217cbb558b89d5a9f2e2e48d191b