[cinnamon/f17] Add requires nautilus for settings

leigh123linux leigh123linux at fedoraproject.org
Mon Jul 30 11:54:43 UTC 2012


commit a393ce615b3868d70b36984ecf210cf77e967fbc
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Jul 30 12:54:19 2012 +0100

    Add requires nautilus for settings
    
    - Remove fedora logo from package to enable generic spins

 cinnamon.spec     |   13 ++++++++-----
 fedora_icon.patch |   11 +++++++++++
 menu.png          |  Bin 1307 -> 0 bytes
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 56210d2..0eaa895 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -8,7 +8,7 @@
 
 Name:           cinnamon
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -21,7 +21,6 @@ Source1:        cinnamon.desktop
 Source2:        cinnamon.session
 Source3:        cinnamon2d.desktop
 Source4:        cinnamon2d.session
-Source5:        menu.png
 
 
 # Fix menu structure
@@ -29,6 +28,7 @@ Patch0:         cinnamon-1.4.1_menu.patch
 Patch1:         cinnamon-1.5.0_datetime_setting.patch
 # Replace mint favorites with fedora gnome-shell defaults
 Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
+Patch3:         fedora_icon.patch
 
 # upstream patches and pending pulls
 Patch11:        systray.patch
@@ -100,6 +100,7 @@ Requires:       accountsservice-libs
 # needed for settings
 Requires:       pygobject2
 Requires:       dbus-python
+Requires:       nautilus
 
 %description
 Cinnamon is a Linux desktop which provides advanced
@@ -115,6 +116,7 @@ The emphasis is put on making users feel at home and providing
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # upstream patches and pending pulls
 %patch11 -p1
@@ -137,9 +139,6 @@ rm -f files%{_bindir}/gnome-session-cinnamon  \
  files%{_datadir}/gnome-session/sessions/cinnamon*.session
 install -pm 644 %SOURCE1 %SOURCE3 files%{_datadir}/xsessions/
 install -pm 644 %SOURCE2 %SOURCE4 files%{_datadir}/gnome-session/sessions/
-# replace menu image
-rm -f data/theme/menu.png
-install -p %SOURCE5 data/theme/menu.png
 # files replaced with fedora files
 rm -f files%{_datadir}/desktop-directories/cinnamon-{menu-applications,utility,utility-accessibility,development,education,game,graphics,network,audio-video,office,system-tools,other}.directory
 # adjust font size
@@ -225,6 +224,10 @@ fi
 
 
 %changelog
+* Mon Jul 30 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-2
+- Add requires nautilus for settings
+- Remove fedora logo from package to enable generic spins
+
 * Fri Jul 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-1
 - update to 1.5.2 release
 - patch systray applet
diff --git a/fedora_icon.patch b/fedora_icon.patch
new file mode 100644
index 0000000..3b792ec
--- /dev/null
+++ b/fedora_icon.patch
@@ -0,0 +1,11 @@
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -236,7 +236,7 @@
+     </key>
+     
+     <key type="s" name="menu-icon">
+-      <default>"/usr/share/cinnamon/theme/menu.png"</default>
++      <default>"/usr/share/icons/Fedora/22x22/places/start-here.png"</default>
+       <_summary>Icon for the menu</_summary>
+       <_description>
+ 	    The icon shown in the Menu button.


More information about the scm-commits mailing list