From 77a74d9298414266205f75d9508f31f1e574fd4f Mon Sep 17 00:00:00 2001
From: TI_Eugene <ti.eugene@gmail.com>
Date: Apr 21 2021 19:55:49 +0000
Subject: Merge branch 'rawhide' into f34


---

diff --git a/.gitignore b/.gitignore
index 5a7ca60..e8656bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tkrzw-0.9.3.tar.gz
+/tkrzw-0.9.5.tar.gz
diff --git a/sources b/sources
index 6ab1062..424c3c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tkrzw-0.9.3.tar.gz) = 3c461b2796948fec9a1b9e85d5b66f1c862c358614adce55cd1e0815639fe9a848de974c315d19325ef50378c2b787acd865f6e2e21ce4fd3eb6b3806239c8df
+SHA512 (tkrzw-0.9.5.tar.gz) = 1aae80cf1296ff7439e7e76754502de894ea9d5553d9f60eafa7dd5b5d1ec8e733a13e744d99457b4cb0b387ca0daf0474b59219e8e9670ea30d8fe3264e4ec3
diff --git a/tkrzw-0.9.3-do-not-override-build-flags.patch b/tkrzw-0.9.3-do-not-override-build-flags.patch
deleted file mode 100644
index 40a43a2..0000000
--- a/tkrzw-0.9.3-do-not-override-build-flags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur tkrzw-0.9.3-original/configure.in tkrzw-0.9.3/configure.in
---- tkrzw-0.9.3-original/configure.in	2020-08-02 02:18:07.000000000 -0400
-+++ tkrzw-0.9.3/configure.in	2021-01-15 09:48:20.893224299 -0500
-@@ -21,13 +21,13 @@
- MYPCFILES="tkrzw.pc"
- 
- # Building flags
--MYCFLAGS="-pthread -Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2"
--MYCXXFLAGS="-std=c++17 -pthread -Wall -fPIC -fsigned-char -g0 -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I/usr/local/include"
-+MYCFLAGS="-pthread -fPIC -fsigned-char"
-+MYCXXFLAGS="-std=c++17 -pthread -fPIC -fsigned-char"
-+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
- MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200809L"
- MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
--MYLDFLAGS="-L. -L\$(LIBDIR) -L/usr/local/lib"
--MYCMDLDFLAGS="-L. -L\$(LIBDIR) -L/usr/local/lib"
-+MYLDFLAGS="-L. -L\$(LIBDIR)"
-+MYCMDLDFLAGS="-L. -L\$(LIBDIR)"
- MYCMDLIBS="-ltkrzw"
- MYTESTLIBS="-lgtest -lgmock -lpthread"
- MYLDLIBPATH=""
-@@ -168,13 +168,6 @@
-     sed -e 's/-lpthread/-Wl,--whole-archive -lpthread -Wl,--no-whole-archive/'`
- fi
- 
--# As-needed linking
--if uname | grep Linux >config.tmp
--then
--  MYLDFLAGS="$MYLDFLAGS -Wl,-rpath-link,.:/usr/local/lib:$MYLDLIBPATH"
--  MYLDFLAGS="$MYLDFLAGS -Wl,--as-needed"
--fi
--
- # Shared libraries
- if test "$enable_shared" != "no" && test "$enable_profile" != "yes"
- then
diff --git a/tkrzw.spec b/tkrzw.spec
index bdb5652..554c71f 100644
--- a/tkrzw.spec
+++ b/tkrzw.spec
@@ -1,17 +1,14 @@
 %global _lto_cflags %{nil}
 
 Name:		tkrzw
-Version:	0.9.3
-Release:	6%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A straightforward implementation of DBM
 License:	ASL 2.0
 URL:		https://dbmx.net/%{name}/
 Source0:	https://dbmx.net/%{name}/pkg/%{name}-%{version}.tar.gz
-# https://github.com/estraier/tkrzw/issues/6
-# https://github.com/estraier/tkrzw/issues/7
-Patch0:		tkrzw-0.9.3-do-not-override-build-flags.patch
 # Developer's recomendation (https://github.com/estraier/tkrzw/issues/5)
-Patch1:		tkrzw-0.9.3-skip-excessive-mlock-pages-tests.patch
+Patch0:		tkrzw-0.9.3-skip-excessive-mlock-pages-tests.patch
 BuildRequires:	gcc-c++
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -91,7 +88,7 @@ install -t %{buildroot}%{_mandir}/man1 -m 0644 -p *.1
 %files	libs
 %license COPYING
 %doc CONTRIBUTING.md
-%{_libdir}/lib%{name}.so.{0,0.3.0}
+%{_libdir}/lib%{name}.so.{0,0.5.0}
 
 %files	devel
 %doc example
@@ -105,6 +102,9 @@ install -t %{buildroot}%{_mandir}/man1 -m 0644 -p *.1
 
 
 %changelog
+* Wed Apr 21 2021 TI_Eugene <ti.eugene@gmail.com> - 0.9.5-1
+- Version bump
+
 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 0.9.3-6
 - Rebuilt for removed libstdc++ symbol (#1937698)