From 2097e196fa060f1dfd266ed3526916d6e5787a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@fedoraproject.org>
Date: Mon, 28 Mar 2016 17:01:59 +0200
Subject: [PATCH] Update to 3.5.27

---
 .gitignore     |  1 +
 djvulibre.spec | 35 +++++++++++++++++++++++++++--------
 sources        |  2 +-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index eab2485..c335e44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ djvulibre-3.5.22.tar.gz
 /djvulibre-3.5.24.tar.gz
 
 /djvulibre-3.5.25.3.tar.gz
+/djvulibre-3.5.27.tar.gz
diff --git a/djvulibre.spec b/djvulibre.spec
index 3037167..c1802bb 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -2,14 +2,14 @@
 
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.25.3
-Release: 18%{?dist}
+Version: 3.5.27
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
 Source0: http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
 Patch0: djvulibre-3.5.22-cdefs.patch
-Patch1: djvulibre-3.5.25.3-cflags.patch
+#Patch1: djvulibre-3.5.25.3-cflags.patch
 
 Requires(post): xdg-utils
 Requires(preun): xdg-utils
@@ -59,9 +59,9 @@ Development files for DjVuLibre.
 
 
 %prep
-%setup -q -n %{name}-3.5.25
+%setup -q 
 %patch0 -p1 -b .cdefs
-%patch1 -p1 -b .cflags
+#%patch1 -p1 -b .cflags
 
 
 %build 
@@ -105,11 +105,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/bzz
 pushd desktopfiles
 for i in 22 32 48 64 ; do
     install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/
-    cp -a ./hi${i}-djvu.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/image-vnd.djvu.mime.png
+    cp -a ./prebuilt-hi${i}-djvu.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/image-vnd.djvu.mime.png
 #    cp -a ./hi${i}-djvu.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/gnome-mime-image-vnd.djvu.png
 done
 popd
 
+
 %post
 # Unregister menu entry for djview3 if it is present as we no longer
 # ship this in favour of the djview4 package. These files were
@@ -120,6 +121,7 @@ rm -f %{_datadir}/icons/hicolor/32x32/apps/djvulibre-djview3.png || :
 
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %preun
 # This is the legacy script, not compliant with current packaging
 # guidelines. However, we leave it in, as the old packages didn't own
@@ -129,17 +131,21 @@ if [ $1 -eq 0 ]; then
     %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || :
 fi
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %post libs -p /sbin/ldconfig
 
+
 %postun libs -p /sbin/ldconfig
 
 
@@ -148,10 +154,19 @@ fi
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/djvu/
+%{_datadir}/icons/hicolor/16x16/mimetypes/*
+%{_datadir}/icons/hicolor/20x20/mimetypes/*
 %{_datadir}/icons/hicolor/22x22/mimetypes/*
+%{_datadir}/icons/hicolor/24x24/mimetypes/*
 %{_datadir}/icons/hicolor/32x32/mimetypes/*
-%{_datadir}/icons/hicolor/64x64/mimetypes/*
 %{_datadir}/icons/hicolor/48x48/mimetypes/*
+%{_datadir}/icons/hicolor/64x64/mimetypes/*
+%{_datadir}/icons/hicolor/72x72/mimetypes/*
+%{_datadir}/icons/hicolor/96x96/mimetypes/*
+%{_datadir}/icons/hicolor/128x128/mimetypes/*
+%{_datadir}/icons/hicolor/scalable/mimetypes/*
+%{_datadir}/mime/packages/*
+%{_datadir}/icons/hicolor/256x256/mimetypes/*
 
 
 %files libs
@@ -159,6 +174,7 @@ fi
 %doc README COPYRIGHT COPYING NEWS
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*.*
@@ -169,6 +185,9 @@ fi
 
 
 %changelog
+* Mon Mar 28 2016 François Cami <fcami@fedoraproject.org> - 3.5.27-1
+- Update to latest upstream.
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.25.3-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -178,7 +197,7 @@ fi
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.5.25.3-16
 - Rebuilt for GCC 5 C++11 ABI change
 
-* Fri Jan 09 2015 François Cami <fcami@fedoraproject.org> - - 3.5.25.3-15
+* Fri Jan 09 2015 François Cami <fcami@fedoraproject.org> - 3.5.25.3-15
 - Fix bogus date in changelog + use PIC.
 
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.25.3-14
diff --git a/sources b/sources
index 3e2358e..e3c3e9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f45d6cd5700b4dd31b1eb963482089b  djvulibre-3.5.25.3.tar.gz
+aa4ed331f669f5a72e3c0d7f9196c4e6  djvulibre-3.5.27.tar.gz