[cinnamon] update to 1.6.7 release
leigh123linux
leigh123linux at fedoraproject.org
Wed Nov 14 18:04:17 UTC 2012
commit a6ee6e69028b4dcb57786d132e6827096ba690fc
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Wed Nov 14 18:04:05 2012 +0000
update to 1.6.7 release
.gitignore | 1 +
cinnamon.spec | 110 ++++++++++++++++++++++++++++++++++----------
cinnamon_menu_applet.patch | 39 +++++++++++++++
sources | 2 +-
4 files changed, 127 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e4d9f3..4f49ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/cinnamon-1.6.6.tar.gz
+/cinnamon-1.6.7.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index f11d9cb..b77bf4e 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global _internal_version d60f9c0
+%global _internal_version 5ab432d
%{?filter_setup:
%filter_from_provides /^libcinnamon.so/d;
@@ -7,8 +7,8 @@
}
Name: cinnamon
-Version: 1.6.6
-Release: 3%{?dist}
+Version: 1.6.7
+Release: 1%{?dist}
Summary: Window management and application launching for GNOME
Group: User Interface/Desktops
@@ -34,6 +34,7 @@ Patch2: cinnamon-1.6.0_favourite-apps-firefox.patch
Patch3: fedora_icon.patch
Patch4: cinnamon.css.patch
Patch5: keyboard_applet.patch
+Patch6: cinnamon_menu_applet.patch
# upstream patches and pending pulls
@@ -100,24 +101,62 @@ Requires: at-spi2-atk%{?_isa}
Requires: caribou%{?_isa}
# needed for the user menu
Requires: accountsservice-libs
+
+
+%description
+Cinnamon is a Linux desktop which provides advanced
+ innovative features and a traditional user experience.
+
+The desktop layout is similar to Gnome 2.
+The underlying technology is forked from Gnome Shell.
+The emphasis is put on making users feel at home and providing
+ them with an easy to use and comfortable desktop experience.
+
+%package 2d
+Summary: Browser plugins for the Cinnamon Desktop
+Group: User Interface/Desktops
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description 2d
+The Cinnamon Desktop provides advanced innovative features and a traditional
+user experience. The underlying technology is forked from gnome-shell and the
+desktop layout is closer to GNOME2. The emphasis is put on making users look
+and feel at home and provide them an easy to use and confortable experience.
+
+%package settings
+Summary: Settings GUI for Cinnamon
+Group: Applications/System
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
# needed for settings
Requires: pygobject2
Requires: dbus-python
Requires: python-lxml
Requires: gnome-python2-gconf
Requires: python-imaging
+
+%description settings
+The Cinnamon Desktop provides advanced innovative features and a traditional
+user experience. The underlying technology is forked from gnome-shell and the
+desktop layout is closer to GNOME2. The emphasis is put on making users look
+and feel at home and provide them an easy to use and confortable experience.
+
+%package menu-editor
+Summary: Menu editor for Cinnamon based on Alacarte
+Group: Applications/System
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
# needed for cinnamon-menu
# https://bugzilla.redhat.com/show_bug.cgi?id=872694
Requires: gnome-panel
-%description
-Cinnamon is a Linux desktop which provides advanced
- innovative features and a traditional user experience.
+%description menu-editor
+The Cinnamon Desktop provides advanced innovative features and a traditional
+user experience. The underlying technology is forked from gnome-shell and the
+desktop layout is closer to GNOME2. The emphasis is put on making users look
+and feel at home and provide them an easy to use and confortable experience.
-The desktop layout is similar to Gnome 2.
-The underlying technology is forked from Gnome Shell.
-The emphasis is put on making users feel at home and providing
- them with an easy to use and comfortable desktop experience.
%prep
%setup -q -n linuxmint-Cinnamon-%{_internal_version}
@@ -131,6 +170,8 @@ The emphasis is put on making users feel at home and providing
# https://github.com/linuxmint/Cinnamon/issues/1337#issuecomment-10342075
%patch5 -p1
+%patch6 -p1
+
# upstream patches and pending pulls
@@ -163,7 +204,7 @@ NOCONFIGURE=1 ./autogen.sh
%build
export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
-%configure --disable-static
+%configure --disable-static --enable-compile-warnings=yes
make V=1 %{?_smp_mflags}
%install
@@ -189,7 +230,7 @@ desktop-file-install \
--add-only-show-in="GNOME" \
--delete-original \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-settings.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/*
%find_lang %{name}
@@ -205,33 +246,54 @@ fi
%files -f %{name}.lang
%doc COPYING README
%{_bindir}/cinnamon
-%{_bindir}/cinnamon2d
-%{_bindir}/gnome-session-cinnamon2d
%exclude %{_bindir}/cinnamon-launcher
-%{_bindir}/cinnamon-menu-editor
-%{_bindir}/cinnamon-settings
%{_bindir}/cinnamon-extension-tool
%{_sysconfdir}/xdg/menus/cinnamon-applications.menu
-%{_sysconfdir}/xdg/menus/cinnamon-settings.menu
%{_sysconfdir}/xdg/autostart/cinnamon*-screensaver.desktop
%{_datadir}/desktop-directories/cinnamon-*.directory
%{_datadir}/glib-2.0/schemas/*.xml
%{_datadir}/applications/cinnamon.desktop
-%{_datadir}/applications/cinnamon2d.desktop
-%{_datadir}/applications/cinnamon-settings.desktop
-%{_datadir}/xsessions/cinnamon*.desktop
-%{_datadir}/gnome-session/sessions/cinnamon*.session
+%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
+%{_datadir}/xsessions/cinnamon.desktop
+%{_datadir}/gnome-session/sessions/cinnamon.session
%{_datadir}/cinnamon/
-%{_datadir}/cinnamon-menu-editor/
-%{_datadir}/cinnamon-settings/
%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
%{_libdir}/cinnamon/
%{_libexecdir}/cinnamon/cinnamon-perf-helper
%{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
-%{_mandir}/man1/*.1.*
+%{_mandir}/man1/cinnamon.1.*
+%{_mandir}/man1/cinnamon-extension-tool.1.*
+%{_mandir}/man1/cinnamon-launcher.1.*
+%{_mandir}/man1/gnome-session-cinnamon.1.*
+
+%files settings
+%{_sysconfdir}/xdg/menus/cinnamon-settings.menu
+%{_bindir}/cinnamon-settings
+%{_datadir}/cinnamon-settings/
+%{_datadir}/applications/cinnamon-settings.desktop
+%{_mandir}/man1/cinnamon-settings.1.*
+
+%files menu-editor
+%{_bindir}/cinnamon-menu-editor
+%{_datadir}/cinnamon-menu-editor/
+%{_datadir}/applications/cinnamon-menu-editor.desktop
+%{_mandir}/man1/cinnamon-menu-editor.1.*
+
+%files 2d
+%{_bindir}/cinnamon2d
+%{_bindir}/gnome-session-cinnamon2d
+%{_datadir}/applications/cinnamon2d.desktop
+%{_datadir}/gnome-session/sessions/cinnamon2d.session
+%{_datadir}/xsessions/cinnamon2d.desktop
+%{_mandir}/man1/gnome-session-cinnamon2d.1.*
+%{_mandir}/man1/cinnamon2d.1.*
%changelog
+* Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.7-1
+- update to 1.6.7 release
+- split menu setting, settings and 2d into sub-packages
+
* Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.6-3
- drop requires libgnomekbd (rhbz 874218)
- fix error in datetime patch
diff --git a/cinnamon_menu_applet.patch b/cinnamon_menu_applet.patch
new file mode 100644
index 0000000..d76be45
--- /dev/null
+++ b/cinnamon_menu_applet.patch
@@ -0,0 +1,39 @@
+--- a/files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js
+@@ -27,6 +27,7 @@
+ const MAX_RECENT_FILES = 20;
+
+ const USER_DESKTOP_PATH = FileUtils.getUserDesktopDir();
++const MENU_EDIT_OK = FileUtils.testMenuEditDeps();
+
+
+ let appsys = Cinnamon.AppSystem.get_default();
+@@ -746,8 +747,11 @@
+ Main.placesManager.connect('places-updated', Lang.bind(this, this._refreshApps));
+ this.RecentManager.connect('changed', Lang.bind(this, this._refreshApps));
+
+- this.edit_menu_item = new Applet.MenuItem(_("Edit menu"), Gtk.STOCK_EDIT, Lang.bind(this, this._launch_editor));
+- this._applet_context_menu.addMenuItem(this.edit_menu_item);
++ if ( MENU_EDIT_OK ) {
++ this.edit_menu_item = new Applet.MenuItem(_("Edit menu"), Gtk.STOCK_EDIT, Lang.bind(this, this._launch_editor));
++ this._applet_context_menu.addMenuItem(this.edit_menu_item);
++ }
++
+ let settings_menu_item = new Applet.MenuItem(_("Menu settings"), null, function() {
+ Util.spawnCommandLine("cinnamon-settings menu");
+ });
+--- a/js/misc/fileUtils.js
++++ b/js/misc/fileUtils.js
+@@ -45,6 +45,12 @@
+ deleteGFile(dir);
+ }
+
++
++function testMenuEditDeps() {
++ let MenuEditReq = Gio.file_new_for_path("/usr/bin/cinnamon-menu-editor");
++ return MenuEditReq.query_exists(null);
++}
++
+ function getUserDesktopDir() {
+ // Didn't find a function returning the user desktop dir, so parsing the user-dirs.dirs file to get it
+ let userdirsFile = Gio.file_new_for_path(GLib.get_home_dir()+"/.config/user-dirs.dirs");
diff --git a/sources b/sources
index 863a90b..5354a76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7dc16d9087a3a7f5d5e5a84216aaf02 cinnamon-1.6.6.tar.gz
+ea73c6367d43d82c61f977477bf0c08c cinnamon-1.6.7.tar.gz
More information about the scm-commits
mailing list