[caja/f20] git add caja_disable-desktop-in-other-desktops.patch to spec file

Wolfgang Ulbrich raveit65 at fedoraproject.org
Wed Jan 21 17:35:53 UTC 2015


commit ad3bfdec5f47f9d70934c127625e03d58b1b681c
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Jan 21 18:36:18 2015 +0100

    git add caja_disable-desktop-in-other-desktops.patch to spec file

 caja.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/caja.spec b/caja.spec
index 2d0ef73..7699e38 100644
--- a/caja.spec
+++ b/caja.spec
@@ -15,7 +15,7 @@
 Name:        caja
 Summary:     File manager for MATE
 Version:     %{branch}.2
-Release:     1%{?dist}
+Release:     2%{?dist}
 #Release:     0.1%{?git_rel}%{?dist}
 License:     GPLv2+ and LGPLv2+
 Group:       User Interface/Desktops
@@ -33,6 +33,9 @@ URL:         http://mate-desktop.org
 Patch1:    caja_allow-dropping-files-to-bookmarks.patch
 # http://git.mate-desktop.org/caja/commit/?id=60d4f83b0fab7633e73e8f4689f4c6931927c2ba
 Patch2:    caja_rearranged-caja-sidebar-to-1.4-style.patch
+# rhbz (#1114684)
+# http://git.mate-desktop.org/caja/commit/?id=23b75da
+Patch3:    caja_disable-desktop-in-other-desktops.patch
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
@@ -117,6 +120,7 @@ for developing caja extensions.
 
 %patch1 -p1 -b .bookmarks
 %patch2 -p1 -b .1.4-style
+%patch3 -p1 -b .disable-desktop
 
 # needed for git snapshots
 #NOCONFIGURE=1 ./autogen.sh
@@ -222,6 +226,9 @@ fi
 
 
 %changelog
+* Wed Jan 21 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-2
+- fix rhbz (#1114684)
+
 * Mon Sep 29 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-1
 - update to 1.8.2 release
 - removed upstreamed caja_font-color-desktop.patch


More information about the scm-commits mailing list