[cinnamon/f17] update to 1.6.3 release

[leigh123linux]

commit 1f67433068acb191d8d3870c00e768a981e57553
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 20 22:05:11 2012 +0100

    update to 1.6.3 release

 cinnamon.spec |   20 ++++++++++++++------
 sources       |    2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 6cd15e7..bbe73f0 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global        _internal_version  1359845
+%global        _internal_version  b632726
 
 %{?filter_setup:
 %filter_from_provides /^libcinnamon.so/d;
@@ -7,12 +7,13 @@
 }
 
 Name:           cinnamon
-Version:        1.6.1
+Version:        1.6.3
 Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
-License:        GPLv2+
+# cinnamon-menu-editor is LGPLv2+
+License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
 # To generate tarball
 # wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz
@@ -137,12 +138,13 @@ rm -rf data/org.cinnamon.gschema.xml
 mv files/usr/lib/cinnamon-settings files%{_datadir}
 sed -i -e 's@/usr/lib@/usr/share at g' files%{_bindir}/cinnamon-settings \
   files%{_datadir}/cinnamon-settings/cinnamon-settings.py \
-  js/ui/panel.js
+  js/ui/panel.js cinnamon.pot
 # make changes for menu-editor move to /usr/share
 mv files/usr/lib/cinnamon-menu-editor files%{_datadir}
 rm -rf files/usr/lib
 sed -i -e 's@/usr/lib@/usr/share at g' files%{_bindir}/cinnamon-menu-editor \
   files%{_datadir}/cinnamon-menu-editor/Alacarte/MainWindow.py
+sed -i -e 's at -OOt@-t at g' files%{_bindir}/cinnamon-menu-editor
 # remove and replace the session files as they don't work with fedora (can't be bothered to patch it)
 rm -f files%{_bindir}/gnome-session-cinnamon  \
  files%{_datadir}/xsessions/cinnamon*.desktop \
@@ -155,12 +157,12 @@ rm -f files%{_datadir}/desktop-directories/cinnamon-{menu-applications,utility,u
 rm -f configure
 rm -rf debian/
 
+NOCONFIGURE=1 ./autogen.sh
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
-NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
@@ -223,6 +225,12 @@ fi
 
 
 %changelog
+* Sat Oct 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.3-1
+- update to 1.6.3 release
+- add license for cinnamon-menu-editor
+- remove -OO from cinnamon-menu-editor script
+- drop upstream patch
+
 * Tue Oct 09 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-2
 - fix settings applet icons
 - patch font size (Bzr 864050)
diff --git a/sources b/sources
index 1bcaa49..c091cca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-702c66bc6ea846058a671f07fff6f94d  cinnamon-1.6.1.tar.gz
+65f5bd9b09f191fae7b9cb7640e20076  cinnamon-1.6.3.tar.gz