[mate-file-manager/f17] fix mate-doc xml error (patch out reference to non-existent caja-extension-i18n.xml)

[leigh123linux]

commit 6e518cb0bbebcfcd12808dab258205f1711fd205
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 18 18:46:59 2012 +0100

    fix mate-doc xml error (patch out reference to non-existent caja-extension-i18n.xml)
    
    - verbose build

 mate-file-manager-1.4.0-docfix.patch |   11 +++++++++++
 mate-file-manager.spec               |   16 ++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/mate-file-manager-1.4.0-docfix.patch b/mate-file-manager-1.4.0-docfix.patch
new file mode 100644
index 0000000..b6c057d
--- /dev/null
+++ b/mate-file-manager-1.4.0-docfix.patch
@@ -0,0 +1,11 @@
+diff -up mate-file-manager-1.4.0/docs/reference/libcaja-extension/libcaja-extension-docs.xml.docfix mate-file-manager-1.4.0/docs/reference/libcaja-extension/libcaja-extension-docs.xml
+--- mate-file-manager-1.4.0/docs/reference/libcaja-extension/libcaja-extension-docs.xml.docfix	2012-07-05 12:58:54.000000000 -0500
++++ mate-file-manager-1.4.0/docs/reference/libcaja-extension/libcaja-extension-docs.xml	2012-10-18 12:18:54.424530371 -0500
+@@ -18,7 +18,6 @@
+       <title>Extension Interfaces</title>
+       <xi:include href="xml/caja-column-provider.xml" />
+       <xi:include href="xml/caja-column.xml" />
+-      <xi:include href="xml/caja-extension-i18n.xml" />
+       <xi:include href="xml/caja-extension-types.xml" />
+       <xi:include href="xml/caja-file-info.xml" />
+       <xi:include href="xml/caja-info-provider.xml" />
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index 289717c..42c3ac1 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -12,7 +12,7 @@
 Name:			mate-file-manager
 Summary:		File manager for MATE
 Version:		1.4.0
-Release:		11%{?dist}
+Release:		12%{?dist}
 License:		GPLv2+ and LGPLv2+
 Group:			User Interface/Desktops
 Source0:		http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
@@ -60,12 +60,12 @@ Patch2:		caja-gvfs-desktop-key-2.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch3:		caja-filetype-symlink-fix.patch
 
-# https://github.com/mate-desktop/mate-desktop/issues/16
-Patch4:		caja_remove_mate-bg-crossfade.patch
-
 Patch5:		no_session_delay.patch
 Patch6:		signal_curtain.patch
 
+# upstreamable, don't reference non-existent doc xml file
+Patch7:		mate-file-manager-1.4.0-docfix.patch
+
 
 %description
 Caja (mate-file-manager) is the file manager and graphical shell
@@ -103,9 +103,9 @@ sed -i -e 's,Categories=MATE,Categories=X-MATE,g' src/mate-network-scheme.deskto
 %patch1 -p1 -b .caja-rtl-fix
 %patch2 -p1 -b .gvfs-desktop-key
 %patch3 -p0 -b .symlink
-#%patch4 -p1 -b .caja_remove_mate-bg-crossfade
 %patch5 -p1 -b .no_session_delay
 %patch6 -p1 -b .signal_curtain.patch
+%patch7 -p1 -b .docfix
 
 NOCONFIGURE=1 ./autogen.sh
 
@@ -124,7 +124,7 @@ NOCONFIGURE=1 ./autogen.sh
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 
 export tagname=CC
-LANG=en_US make %{?_smp_mflags}
+LANG=en_US make %{?_smp_mflags} V=1
 
 # strip unneeded translations from .mo files
 cd po
@@ -221,6 +221,10 @@ fi
 
 
 %changelog
+* Thu Oct 18 2012 Rex Dieter <rdieter at fedoraproject.org> - 1.4.0-12
+- fix mate-doc xml error (patch out reference to non-existent caja-extension-i18n.xml)
+- verbose build
+
 * Thu Oct 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-11
 - Drop caja_remove_mate-bg-crossfade patch as it was causing crash