[caja] removed upstreamed patches

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sat Jul 12 19:24:39 UTC 2014


commit 34d76ad13f3f7796acebdf056e8a64b190818643
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Jul 12 21:24:51 2014 +0200

    removed upstreamed patches

 caja.spec |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/caja.spec b/caja.spec
index 8800405..9b2a5d7 100644
--- a/caja.spec
+++ b/caja.spec
@@ -27,13 +27,6 @@ URL:         http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
-# upstream patches
-# fix https://github.com/mate-desktop/mate-file-manager/issues/122
-# http://git.mate-desktop.org/caja/commit/?id=910b9141ac634a86d8f53fda534e33787a160efb
-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
-
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  exempi-devel
@@ -115,9 +108,6 @@ for developing caja extensions.
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
-%patch1 -p1 -b .bookmarks
-%patch2 -p1 -b .1.4-style
-
 # needed for git snapshots
 #NOCONFIGURE=1 ./autogen.sh
 
@@ -225,6 +215,7 @@ fi
 * Sat Jul 12 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.1-1
 - update to 1.9.1 release
 - move gtk-docs to -devel subpackage
+- removed upstreamed patches
 
 * Tue Jul 08 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.1-3
 - optimize/update scriptlets


More information about the scm-commits mailing list