[cinnamon: 1/2] update to latest git

leigh123linux leigh123linux at fedoraproject.org
Wed Sep 18 17:52:03 UTC 2013


commit ac2f2c37b85e2661d53a6d4a1fd6985ad48e2e49
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Sep 18 18:49:48 2013 +0100

    update to latest git

 .gitignore                   |    1 +
 bluetooth_applet_fixes.patch |   81 ------------------------------------------
 cinnamon-settings-apps.patch |   13 +------
 cinnamon.spec                |   15 ++++----
 sources                      |    2 +-
 5 files changed, 12 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e674b0..5c1562e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /cinnamon-1.9.2.git8bdd61f.tar.gz
 /cinnamon-1.9.2.gitd4305ab.tar.gz
 /cinnamon-1.9.2.git2d1ac4d.tar.gz
+/cinnamon-1.9.2.git8a53cfb.tar.gz
diff --git a/cinnamon-settings-apps.patch b/cinnamon-settings-apps.patch
index 43db09f..d7ed35b 100644
--- a/cinnamon-settings-apps.patch
+++ b/cinnamon-settings-apps.patch
@@ -1,18 +1,9 @@
 --- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
 +++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-@@ -53,6 +53,7 @@ CATEGORIES = [
- CONTROL_CENTER_MODULES = [
- #         Label                              Module ID                Icon                         Category      Advanced?                      Keywords for filter
-     [_("Networking"),                       "network",            "network.svg",                 "hardware",      False,          _("network, wireless, wifi, ethernet, broadband, internet")],
-+    [_("Bluetooth"),                        "bluetooth",          "bluetooth.svg",               "hardware",       False,          _("bluetooth, dongle, transfer, mobile")],
-     [_("Display"),                          "display",            "display.svg",                 "hardware",      False,          _("display, screen, monitor, layout, resolution, dual, lcd")],
-     [_("Regional Settings"),                "region",             "region.svg",                     "prefs",      False,          _("region, layout, keyboard, language")],
-     [_("Universal Access"),                 "universal-access",   "universal-access.svg",           "prefs",      False,          _("magnifier, talk, access, zoom, keys, contrast")],
-@@ -64,8 +65,7 @@ CONTROL_CENTER_MODULES = [
+@@ -65,7 +65,7 @@ CONTROL_CENTER_MODULES = [
  STANDALONE_MODULES = [
  #         Label                          Executable                          Icon                Category        Advanced?               Keywords for filter
-     [_("Printers"),                      "system-config-printer",        "printer.svg",         "hardware",       False,          _("printers, laser, inkjet")],
--    [_("Bluetooth"),                     "blueman-manager",              "bluetooth.svg",       "hardware",       False,          _("bluetooth, dongle, transfer, mobile")],
+     [_("Printers"),                      "system-config-printer",        "printer.svg",         "hardware",       False,          _("printers, laser, inkjet")],    
 -    [_("Firewall"),                      "gufw",                         "firewall.svg",        "prefs",          True,           _("firewall, block, filter, programs")],
 +    [_("Firewall"),                      "firewall-config",              "firewall.svg",        "prefs",          True,           _("firewall, block, filter, programs")],
      [_("Languages"),                     "gnome-language-selector",      "language.svg",        "prefs",          False,          _("language, install, foreign")],
diff --git a/cinnamon.spec b/cinnamon.spec
index 39ba362..9d75906 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
-%global _internal_version  2d1ac4d
+%global _internal_version  8a53cfb
 
 Name:           cinnamon
 Version:        1.9.2
-Release:        0.20.git%{_internal_version}%{?dist}
+Release:        0.21.git%{_internal_version}%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -15,10 +15,9 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}
 Source1:        cinnamon-fedora.gschema.override
 
 Patch0:         background.patch
-Patch1:         bluetooth_applet_fixes.patch
-Patch2:         autostart_nemo.patch
-Patch3:         replace_gksu.patch
-Patch4:         cinnamon-settings-apps.patch
+Patch1:         autostart_nemo.patch
+Patch2:         replace_gksu.patch
+Patch3:         cinnamon-settings-apps.patch
 
 %global clutter_version 1.12.2
 %global gobject_introspection_version 1.34.2
@@ -130,7 +129,6 @@ The emphasis is put on making users feel at home and providing
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -202,6 +200,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 18 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.21.git8a53cfb
+- update to latest git
+
 * Sun Aug 25 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.20.git2d1ac4d
 - update to latest git
 - Change buildrequires to cinnamon-desktop-devel
diff --git a/sources b/sources
index cfcc69a..4182d54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41a3d62b23463e5467763f90ed5de84c  cinnamon-1.9.2.git2d1ac4d.tar.gz
+5d9fd2b11ac9bd76e1446d6034947368  cinnamon-1.9.2.git8a53cfb.tar.gz


More information about the scm-commits mailing list