From 0c2ea7ad813c935b32bb72cee25722e0937bbaf9 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 18 Mar 2022 12:50:37 +0100
Subject: [PATCH] Initial EPEL 8 release

Resolves: #1739168
---
 djvulibre-3.5.27-export-file.patch | 28 ----------------------------
 djvulibre.spec                     |  8 +++++---
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 djvulibre-3.5.27-export-file.patch

diff --git a/djvulibre-3.5.27-export-file.patch b/djvulibre-3.5.27-export-file.patch
deleted file mode 100644
index 02a1c44..0000000
--- a/djvulibre-3.5.27-export-file.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- djvulibre-3.5.27/desktopfiles/Makefile.am
-+++ djvulibre-3.5.27/desktopfiles/Makefile.am
-@@ -32,10 +32,9 @@ if HAVE_CONVERSION_INKSCAPE
- convert_icons_process = \
- s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
- ${INKSCAPE} \
----without-gui \
- --export-width=$${s} \
- --export-height=$${s} \
----export-png=$@ $<
-+--export-filename=$@ $<
- endif
- 
- if HAVE_CONVERSION_CONVERT
---- djvulibre-3.5.27/desktopfiles/Makefile.in
-+++ djvulibre-3.5.27/desktopfiles/Makefile.in
-@@ -306,10 +306,9 @@ PNGICONS = \
- @HAVE_CONVERSION_INKSCAPE_TRUE@convert_icons_process = \
- @HAVE_CONVERSION_INKSCAPE_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
- @HAVE_CONVERSION_INKSCAPE_TRUE@${INKSCAPE} \
--@HAVE_CONVERSION_INKSCAPE_TRUE@--without-gui \
- @HAVE_CONVERSION_INKSCAPE_TRUE@--export-width=$${s} \
- @HAVE_CONVERSION_INKSCAPE_TRUE@--export-height=$${s} \
--@HAVE_CONVERSION_INKSCAPE_TRUE@--export-png=$@ $<
-+@HAVE_CONVERSION_INKSCAPE_TRUE@--export-filename=$@ $<
- 
- @HAVE_CONVERSION_RSVG_TRUE@convert_icons_process = \
- @HAVE_CONVERSION_RSVG_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
diff --git a/djvulibre.spec b/djvulibre.spec
index 06a199b..4a0acf5 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -3,13 +3,12 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
 Version: 3.5.28
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 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
-Patch6: djvulibre-3.5.27-export-file.patch
 Patch8: djvulibre-3.5.27-check-image-size.patch
 Patch9: djvulibre-3.5.27-integer-overflow.patch
 Patch10: djvulibre-3.5.27-check-input-pool.patch
@@ -69,7 +68,6 @@ Development files for DjVuLibre.
 %setup -q 
 %patch0 -p1 -b .cdefs
 #%patch1 -p1 -b .cflags
-%patch6 -p1 -b .export-file
 %patch8 -p1 -b .check-image-size
 %patch9 -p1 -b .integer-overflow
 %patch10 -p1 -b .check-input-pool
@@ -183,6 +181,10 @@ fi
 
 
 %changelog
+* Fri Mar 18 2022 Marek Kasik <mkasik@redhat.com> - 3.5.28-3
+- Initial EPEL 8 release
+- Resolves: #1739168
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.28-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild