[cinnamon/f18] add some build conditionals

leigh123linux leigh123linux at fedoraproject.org
Wed Nov 14 21:16:39 UTC 2012


commit 79250b6ec762172809e3dd7069f9e710b8552d02
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 14 21:16:31 2012 +0000

    add some build conditionals

 cinnamon.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index b6f24d5..b2769c2 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -168,7 +168,9 @@ and feel at home and provide them an easy to use and confortable experience.
 
 # keyboard applet patch
 # https://github.com/linuxmint/Cinnamon/issues/1337#issuecomment-10342075
+%if 0%{?fedora} > 17
 %patch5 -p1
+%endif
 
 %patch6 -p1
 
@@ -217,8 +219,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/mozilla
 
 # Add autostart files for gnome-screensaver
+%if 0%{?fedora} > 17
 mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
 install -pm 0644 %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
+%endif
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon2d.desktop
@@ -249,7 +253,9 @@ fi
 %exclude %{_bindir}/cinnamon-launcher
 %{_bindir}/cinnamon-extension-tool
 %{_sysconfdir}/xdg/menus/cinnamon-applications.menu
+%if 0%{?fedora} > 17
 %{_sysconfdir}/xdg/autostart/cinnamon*-screensaver.desktop
+%endif
 %{_datadir}/desktop-directories/cinnamon-*.directory
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/applications/cinnamon.desktop


More information about the scm-commits mailing list