[cinnamon] update to 2.4.6

leigh123linux leigh123linux at fedoraproject.org
Mon Jan 19 16:04:01 UTC 2015


commit 8fc8a1889f99cbaa5b573ca2f98025714f942609
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Jan 19 16:04:20 2015 +0000

    update to 2.4.6

 .gitignore                                         |    1 +
 0001-fix-image-path.patch                          |   25 -----------
 ...tureChooserButton-in-gtk3.14.-Compatible-.patch |   34 --------------
 ...-Don-t-reset-the-category-when-dragging-a.patch |   46 --------------------
 ...cache.c-Make-sure-the-pixbuf-requested-en.patch |   30 -------------
 cinnamon.spec                                      |   13 +++---
 fix_slideshow.patch                                |   29 ------------
 revert_25aef37.patch                               |    9 +---
 sources                                            |    2 +-
 9 files changed, 9 insertions(+), 180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b64cf74..604d838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@
 /Cinnamon-2.4.2.tar.gz
 /Cinnamon-2.4.4.tar.gz
 /Cinnamon-2.4.5.tar.gz
+/Cinnamon-2.4.6.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 4de988b..37255e7 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
 #global _internal_version  ea748a2
 
 Name:           cinnamon
-Version:        2.4.5
-Release:        3%{?dist}
+Version:        2.4.6
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -29,11 +29,6 @@ Patch6:         cinnamon-gtk-3.14.patch
 Patch7:         default_panal_launcher.patch
 Patch8:         remove_session_bits.patch
 Patch9:         show_brightness_fix.patch
-Patch10:        fix_slideshow.patch
-Patch11:        0001-fix-image-path.patch
-Patch12:        0001-fix-the-PictureChooserButton-in-gtk3.14.-Compatible-.patch
-Patch13:        0002-menu-applet-Don-t-reset-the-category-when-dragging-a.patch
-Patch14:        0003-st-texture-cache.c-Make-sure-the-pixbuf-requested-en.patch
 
 %global clutter_version 1.12.2
 %global cjs_version 2.3.1
@@ -259,6 +254,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 19 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.6-1
+- update to 2.4.6
+- drop upstream patches
+
 * Sun Jan 18 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.5-3
 - change to nimbus icon theme
 - add some upstream fixes
diff --git a/revert_25aef37.patch b/revert_25aef37.patch
index 3501550..031cf86 100644
--- a/revert_25aef37.patch
+++ b/revert_25aef37.patch
@@ -24,11 +24,4 @@
 +            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_stock(Gtk.EntryIconPosition.SECONDARY, None)     
-@@ -825,4 +824,4 @@ if __name__ == "__main__":
- 
- 
-         
--                   
-\ No newline at end of file
-+                   
+             self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)                        
diff --git a/sources b/sources
index f698317..573a777 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b48bf816a71fab9ba7296447660ecb1  Cinnamon-2.4.5.tar.gz
+3ef4250eb889c4f8e99e85601a6d750d  Cinnamon-2.4.6.tar.gz


More information about the scm-commits mailing list