[cinnamon] update to 1.6.3 release
leigh123linux
leigh123linux at fedoraproject.org
Sat Oct 20 20:40:48 UTC 2012
commit f9d2fe61374b309d363ae55c0d8fc4f75c174734
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sat Oct 20 21:40:12 2012 +0100
update to 1.6.3 release
cinnamon.spec | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 1a3c807..621736e 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
-Release: 3%{?dist}
+Version: 1.6.3
+Release: 1%{?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
@@ -35,7 +36,6 @@ Patch4: bluetooth_applet.patch
Patch5: cinnamon.css.patch
# upstream patches and pending pulls
-Patch20: menu_applet_fixes.patch
%global clutter_version 1.10.1
@@ -132,7 +132,6 @@ The emphasis is put on making users feel at home and providing
# upstream patches and pending pulls
-%patch20 -p1
# remove gschema
@@ -141,12 +140,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 \
@@ -158,13 +158,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'
@@ -232,6 +231,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
+
* Sat Oct 13 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-3
- autostart for gnome-screensaver so lock works
- mozilla desktop fix
More information about the scm-commits
mailing list