[cinnamon/f19] Update to version 1.8.7

leigh123linux leigh123linux at fedoraproject.org
Sat Jun 1 15:11:25 UTC 2013


commit 9f524aa1f3e2df11d817312b48eabf16de4f5708
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jun 1 16:11:10 2013 +0100

    Update to version 1.8.7
    
    - drop spice patch (now upstream)
    - fix directory ownership and clenup files section

 .gitignore                            |    1 +
 cinnamon-1.4.1_menu.patch             |  158 ----------------------
 cinnamon-1.5.0_datetime_setting.patch |   25 ----
 cinnamon-pillow.patch                 |   32 -----
 cinnamon-screensaver.desktop          |   15 --
 cinnamon.desktop                      |   10 --
 cinnamon.session                      |    6 -
 cinnamon.spec                         |   63 +++------
 cinnamon2d-screensaver.desktop        |   15 --
 cinnamon2d.desktop                    |    7 -
 cinnamon2d.session                    |    4 -
 cinnamon_menu_applet.patch            |   39 ------
 fix_notifications.patch               |  231 ---------------------------------
 sources                               |    2 +-
 spice_crash_fix.patch                 |   49 -------
 15 files changed, 21 insertions(+), 636 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6aef071..8be1143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /cinnamon-1.8.3.tar.gz
 /cinnamon-1.8.5.tar.gz
 /cinnamon-1.8.6.tar.gz
+/cinnamon-1.8.7.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index d9646e7..94a52a6 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
-Version:        1.8.6
-Release:        2%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -12,7 +12,6 @@ Patch0:         gnome-3.8-compat.patch
 Patch1:         background.patch
 Patch2:         idle-dim.patch
 Patch3:         keyboard_applet.patch
-Patch4:         spice_crash_fix.patch
 
 
 BuildRequires:  clutter-devel
@@ -95,7 +94,6 @@ The emphasis is put on making users feel at home and providing
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -127,7 +125,7 @@ desktop-file-install                                 \
  --add-only-show-in="GNOME"                          \
  --delete-original                                   \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications       \
- $RPM_BUILD_ROOT%{_datadir}/applications/*
+ $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-settings.desktop
 
 
 %find_lang %{name}
@@ -142,50 +140,27 @@ fi
 
 %files -f %{name}.lang
 %doc COPYING README
-%{_bindir}/cinnamon
-%{_bindir}/cinnamon3d
-%{_mandir}/man1/*
-%{_bindir}/cinnamon-settings
-%{_datadir}/applications/cinnamon-settings.desktop
-%{_bindir}/cinnamon-menu-editor
-%{_datadir}/applications/cinnamon-menu-editor.desktop
-%{_bindir}/cinnamon2d
-%{_bindir}/gnome-session-cinnamon2d
-%{_datadir}/applications/cinnamon2d.desktop
-%{_datadir}/gnome-session/sessions/cinnamon2d.session
-%{_sysconfdir}/xdg/menus/cinnamon-applications-merged
-%{_sysconfdir}/xdg/menus/cinnamon-applications.menu
-%{_bindir}/cinnamon-extension-tool
-%{_bindir}/cinnamon-launcher
-%{_bindir}/cinnamon-looking-glass
-%{_bindir}/cinnamon-screensaver-lock-dialog
-%{_bindir}/gnome-session-cinnamon
-%{_datadir}/cinnamon/applets
-%{_datadir}/cinnamon/bumpmaps
-%{_datadir}/cinnamon/desklets
-%{_datadir}/cinnamon/icons/move-symbolic.svg
-%{_datadir}/cinnamon/js
-%{_datadir}/cinnamon/search_providers
-%{_datadir}/cinnamon/shaders
-%{_datadir}/cinnamon/theme
-%{_libdir}/cinnamon/Cinnamon-0.1.typelib
-%{_libdir}/cinnamon/Gvc-1.0.typelib
-%{_libdir}/cinnamon/St-1.0.typelib
-%{_libdir}/cinnamon/libcinnamon.so
-%{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
-%{_libexecdir}/cinnamon/cinnamon-perf-helper
-%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
-%{_datadir}/applications/cinnamon.desktop
+%{_bindir}/*
+%{_sysconfdir}/xdg/menus/*
+%{_datadir}/applications/*
+%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
+%{_datadir}/desktop-directories/*
 %{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
-%{_datadir}/gnome-session/sessions/cinnamon.session
-%{_datadir}/xsessions/cinnamon.desktop
-%{_datadir}/xsessions/cinnamon2d.desktop
-%{_datadir}/desktop-directories
+%{_datadir}/gnome-session/sessions/*
+%{_datadir}/xsessions/*
+%{_datadir}/cinnamon/
+%{_libdir}/cinnamon/
+%{_libexecdir}/cinnamon/
 #No choice but to do this. Filing a bug with upstream on this.
 %{_prefix}/lib/cinnamon*/
-%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
+%{_mandir}/man1/*
 
 %changelog
+* Sat Jun 01 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.7-1
+- Update to version 1.8.7
+- drop spice patch (now upstream)
+- fix directory ownership and clenup files section
+
 * Fri May 31 2013 leigh scott <leigh123linux at googlemail.com> - 1.8.6-2
 - patch to fix spice download crash (bz 969162)
 
diff --git a/sources b/sources
index 6107ab2..0bd9962 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5e7996fefdfe2f33b4d4014526b7c8e  cinnamon-1.8.6.tar.gz
+10b239b42ae0efc8be4a3be8d16fdcb8  cinnamon-1.8.7.tar.gz


More information about the scm-commits mailing list