leigh123linux pushed to cinnamon (master). "update to 2.6.0 release"

Wed May 20 08:36:37 UTC 2015

From 38d4d49bb03a80e4224cfc4c1bdb90f01540df12 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 20 May 2015 09:36:23 +0100
Subject: update to 2.6.0 release

diff --git a/.gitignore b/.gitignore
index 4a74c8b..f8a8abe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
 /Cinnamon-2.4.8.tar.gz
 /cinnamon-2.5.1.gitc0ea9e7.tar.gz
 /cinnamon-2.5.0.gitc0ea9e7.tar.gz
+/Cinnamon-2.6.0.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 79cbfa6..d08d29c 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
-%global _internal_version  c0ea9e7
+#global _internal_version  32284cb
 
 Name:           cinnamon
-Version:        2.5.0
-Release:        0.1.git%{_internal_version}%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -11,8 +11,8 @@ URL:            http://cinnamon.linuxmint.com
 # wget https://github.com/linuxmint/Cinnamon/archive/%%{version}.tar.gz -O cinnamon-%%{version}.tar.gz
 # for git
 # wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz
-Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon/source/cinnamon-%{version}.git%{_internal_version}.tar.gz
-#Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamon-%%{version}.tar.gz
+#Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon/source/cinnamon-%%{version}.git%%{_internal_version}.tar.gz
+Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamon-%{version}.tar.gz
 Source1:        polkit-cinnamon-authentication-agent-1.desktop
 Source2:        cinnamon-fedora-20.gschema.override
 Source3:        cinnamon-fedora-21.gschema.override
@@ -35,10 +35,10 @@ Patch7:         default_panal_launcher.patch
 Patch8:         show_brightness_fix.patch
 
 %global clutter_version 1.12.2
-%global cjs_version 2.5.0
-%global cinnamon_desktop_version 2.5.0
+%global cjs_version 2.6.0
+%global cinnamon_desktop_version 2.6.0
 %global gobject_introspection_version 1.34.2
-%global muffin_version 2.5.0
+%global muffin_version 2.6.0
 %global json_glib_version 0.13.2
 
 BuildRequires:  pkgconfig(clutter-1.0) >= %{clutter_version}
@@ -169,7 +169,7 @@ The emphasis is put on making users feel at home and providing
  them with an easy to use and comfortable desktop experience.
 
 %prep
-%autosetup -p1 -n linuxmint-Cinnamon-%{_internal_version}
+%autosetup -p1 -n Cinnamon-%{version}
 
 sed -i -e 's at gksu@pkexec at g'  files/usr/bin/cinnamon-settings-users
 
@@ -222,15 +222,17 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-settings
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/cinnamon-menu-editor.desktop
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/polkit-cinnamon-authentication-agent-1.desktop
 
-# fix hard coded path
+# fix hard coded paths
+sed -i -e 's@/usr/lib/xscreensaver@/usr/libexec/xscreensaver at g' \
+$RPM_BUILD_ROOT/%{_prefix}/lib/cinnamon-settings/modules/cs_screensaver.py
 %ifarch x86_64 ppc64
 sed -i -e 's@/usr/lib/cinnamon-control-center@/usr/lib64/cinnamon-control-center at g' \
-$RPM_BUILD_ROOT/%{_prefix}/lib/cinnamon-settings/bin/capi.py
+$RPM_BUILD_ROOT/%{_prefix}/lib/cinnamon-settings/bin/capi.py 
 %endif
 
-# create directory for lang files
-install -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/cinnamon/locale/
-
+# delete the preload bits till it supports systemd
+rm $RPM_BUILD_ROOT/%{_bindir}/cinnamon-preload*
+rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/cinnamon/
 
 %post
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -269,6 +271,12 @@ fi
 %exclude %{_datadir}/gtk-doc/html/cinnamon-st/
 
 %changelog
+* Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-1
+- update to 2.6.0 release
+
+* Fri May 15 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.2.git32284cb
+- update to git snapshot
+
 * Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.1.gitc0ea9e7
 - update to git snapshot
 
diff --git a/revert_25aef37.patch b/revert_25aef37.patch
index 031cf86..7716af0 100644
--- a/revert_25aef37.patch
+++ b/revert_25aef37.patch
@@ -1,5 +1,5 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py	2014-09-30 09:55:06.000000000 +0100
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py	2014-09-30 19:20:48.151829597 +0100
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
 @@ -45,10 +45,9 @@ class GroupDialog (Gtk.Dialog):
              print detail        
  
@@ -17,10 +17,10 @@
          fullname = self.realname_entry.get_text()
          username = self.username_entry.get_text()
          valid = True
--        if " " in username or username.lower() != username:
+-        if re.search('[^a-z0-9_.-]', username):
 +        if " " in username:
              self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
--            self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain upper-case or space characters"))
+-            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:
diff --git a/sources b/sources
index 3f7c712..ac93c36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c751ec0293cd07bdddc02bdb94e6d9f  cinnamon-2.5.0.gitc0ea9e7.tar.gz
+6c681908526c9db2824f1fc1107a48b4  Cinnamon-2.6.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon.git/commit/?h=master&id=38d4d49bb03a80e4224cfc4c1bdb90f01540df12
