From a5101c53ec181be138b0b74996efd1b365841c3a Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 18 Dec 2023 17:12:51 +0100
Subject: [PATCH] 2253901 - qpdf-11.6.4 is available

---
 .gitignore | 2 ++
 qpdf.spec  | 7 +++++--
 sources    | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f9c3eb..98dbea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,5 @@
 /qpdf-11.6.2-doc.zip
 /qpdf-11.6.3-doc.zip
 /qpdf-11.6.3.tar.gz
+/qpdf-11.6.4.tar.gz
+/qpdf-11.6.4-doc.zip
diff --git a/qpdf.spec b/qpdf.spec
index 741675e..1ce2d94 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name:    qpdf
-Version: 11.6.3
+Version: 11.6.4
 Release: 1%{?dist}
 # MIT: e.g. libqpdf/sha2.c, but those are not compiled in (GNUTLS is used)
 # upstream uses ASL 2.0 now, but he allowed other to distribute qpdf under
@@ -138,7 +138,7 @@ install -m 0644 completions/zsh/_qpdf %{buildroot}%{zsh_completions_dir}/_qpdf
 %doc README.md TODO.md ChangeLog
 %license Artistic-2.0 LICENSE.txt NOTICE.md
 %{_libdir}/libqpdf.so.29
-%{_libdir}/libqpdf.so.29.6.3
+%{_libdir}/libqpdf.so.29.6.4
 
 %files devel
 %doc examples/*.cc examples/*.c
@@ -151,6 +151,9 @@ install -m 0644 completions/zsh/_qpdf %{buildroot}%{zsh_completions_dir}/_qpdf
 
 
 %changelog
+* Mon Dec 18 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.4-1
+- 2253901 - qpdf-11.6.4 is available
+
 * Thu Nov 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.3-1
 - 2244319 - qpdf-11.6.3 is available
 
diff --git a/sources b/sources
index 31a9637..e683476 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 SHA512 (qpdf-11.6.3-doc.zip) = 0cdeb6d408823a49909d2394a9cedd8ae5d4f9fd4f4dbef70ce60c60401bc9b78b1740669f46b78609f11b0b4c8bdaafe094158e52b9449dca32d6afd3ece377
 SHA512 (qpdf-11.6.3.tar.gz) = afc1d130e10bb527a7425ce39f6d93245c3d9b08002d104fdf0e909b586f80174fa2eed863794f10b76bab86a064b904eebca89902212accc45a68f9430c122e
+=======
+SHA512 (qpdf-11.6.4.tar.gz) = 4e2497ae0f2524173b9288466e94a5bcab8326c153a605b4de7a7c55f640934818ecb40c2f9bbb7508c5bd7afd529fa1f88dd08647bfaa4d2b3b6118ca928c9a
+SHA512 (qpdf-11.6.4-doc.zip) = 2ebbf7b257adc56b27f645cdda9b311c21db4823f3fb6227a408e874a4aff4a0de2ccb578e71790287141cacac71e08d3f13b87e34041e0c6a980ea89918826e
+>>>>>>> 63518e9 (2253901 - qpdf-11.6.4 is available)