From fba7e2cd7df003103f38e6a2fae6bb0b460d37cc5a8758f786023bc099aa7828 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Wed, 12 Mar 2014 15:46:03 +0000
Subject: [PATCH] Accepting request 225725 from
home:posophe:branches:X11:MATE:Factory
Fix conflicts with python-mate-file-manager-devel
OBS-URL: https://build.opensuse.org/request/show/225725
OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/python-caja?expand=0&rev=2
---
python-caja.changes | 6 ++++++
python-caja.spec | 2 ++
2 files changed, 8 insertions(+)
diff --git a/python-caja.changes b/python-caja.changes
index 6713607..4adf10c 100644
--- a/python-caja.changes
+++ b/python-caja.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 12 13:11:38 UTC 2014 - p.drouand@gmail.com
+
+- Fix Provides/Obsoletes tags to avoid conflicts with
+ python-mate-file-manager
+
-------------------------------------------------------------------
Wed Mar 5 13:06:52 UTC 2014 - p.drouand@gmail.com
diff --git a/python-caja.spec b/python-caja.spec
index 46e7dcb..e956fd9 100644
--- a/python-caja.spec
+++ b/python-caja.spec
@@ -43,6 +43,8 @@ so that Nautilus functionality can be easily extended.
Summary: Python bindings for Caja - Development Files
Group: Development/Libraries/Other
Requires: %{name} = %{version}
+Provides: python-mate-file-manager-devel = %{version}
+Obsoletes: python-mate-file-manager-devel < %{version}
%description devel
Development files needed for writing Caja Python extensions