[atril] remove upstreamed patches + add configure patch

[Wolfgang Ulbrich]

commit 94147891107f38031a17670c5c35b9314cff29f1
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sun Oct 26 01:02:38 2014 +0200

    remove upstreamed patches + add configure patch

 atril.spec                                         |   28 +++----
 ...create_thumbnail_frame-should-return-NULL.patch |   25 ------
 atril_djvu-fix-case-sensitive-search.patch         |   87 --------------------
 atril_epub-mimetypes.patch                         |   14 +++
 ...-sure-page-labels-are-valid-utf-8-strings.patch |   38 ---------
 5 files changed, 25 insertions(+), 167 deletions(-)
---
diff --git a/atril.spec b/atril.spec
index bd93410..89d6c22 100644
--- a/atril.spec
+++ b/atril.spec
@@ -26,12 +26,8 @@ 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}}
 
-# http://git.mate-desktop.org/atril/commit/?id=ec3b83d34ffeaf2c0d16ba013fcba64f17fab203
-# fix rhbz (#999912)
-Patch1:         atril_djvu-fix-case-sensitive-search.patch
-# rhbz (#1082143)
-Patch2:         atril_make-sure-page-labels-are-valid-utf-8-strings.patch
-Patch3:         atril_create_thumbnail_frame-should-return-NULL.patch
+# http://git.mate-desktop.org/atril/commit/?id=0ca75dc
+Patch0:         atril_epub-mimetypes.patch
 
 BuildRequires:  gtk2-devel
 BuildRequires:  poppler-glib-devel
@@ -57,6 +53,8 @@ BuildRequires:  caja-devel
 BuildRequires:  kpathsea-devel
 # for the djvu back-end
 BuildRequires:  djvulibre-devel
+# for epub back-end
+BuildRequires:  webkitgtk-devel
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 #  fix (#974791)
@@ -131,15 +129,13 @@ caja file manager.
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
-%patch1 -p1 -b .djvu
-%patch2 -p1 -b .page-labels
-%patch3 -p1 -b .create_thumbnail
+%patch0 -p1 -b .configure
 
 # needed for git snapshots
 #NOCONFIGURE=1 ./autogen.sh
 
 # Build fails without this
-#autoreconf -fi
+autoreconf -fi
 
 %build
 %configure \
@@ -201,7 +197,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 
-%files -f atril.lang
+%files -f %{name}.lang
 %doc README COPYING NEWS AUTHORS
 %{_bindir}/*
 %dir %{_datadir}/atril
@@ -218,11 +214,8 @@ fi
 %files libs
 %{_libdir}/libatrilview.so.*
 %{_libdir}/libatrildocument.so.*
-%dir %{_libdir}/atril/
-%dir %{_libdir}/atril/3/
-%dir %{_libdir}/atril/3/backends/
-%{_libdir}/atril/3/backends/lib*document.so
-%{_libdir}/atril/3/backends/*document.atril-backend
+%{_libdir}/atril/3/backends/
+#%{_libdir}/atril/3/backends/epub/
 %{_libdir}/girepository-1.0/AtrilDocument-1.5.0.typelib
 %{_libdir}/girepository-1.0/AtrilView-1.5.0.typelib
 
@@ -245,12 +238,13 @@ fi
 %{_datadir}/gtk-doc/html/libatrilview-1.5.0/
 %{_datadir}/gtk-doc/html/atril/
 
-
 %changelog
 * Sun Oct 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.0-1
 - update to 1.9.0
 - Add epub support (part of GSoC 2014).
 - Use MateAboutDialog from libmate-desktop
+- remove upstreamed patches
+- add configure patch
 
 * Sat Oct 11 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
 - enable thumbnailer support and use a -thumbnailer subpackage for it
diff --git a/atril_epub-mimetypes.patch b/atril_epub-mimetypes.patch
new file mode 100644
index 0000000..313390f
--- /dev/null
+++ b/atril_epub-mimetypes.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index d07c08e..3f0e59e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -751,7 +751,7 @@ if test "x$enable_xps" = "xyes"; then
+     ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
+ fi
+ if test "x$enable_epub" = "xyes"; then
+-	ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/epub+zip"
++	ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/epub+zip;"
+ fi
+ 
+ AC_SUBST(ATRIL_MIME_TYPES)
+