From fa22f596e647216bf908f38aa01d6e9c6ff14a5c Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 3 Jan 2025 11:29:13 +0800
Subject: [PATCH] fix build with sqlite 3.46

---
 ...e3-1.4.4-update-test-for-sqlite-3_46.patch | 23 +++++++++++++++++++
 rubygem-sqlite3.spec                          | 10 ++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 rubygem-sqlite3-1.4.4-update-test-for-sqlite-3_46.patch

diff --git a/rubygem-sqlite3-1.4.4-update-test-for-sqlite-3_46.patch b/rubygem-sqlite3-1.4.4-update-test-for-sqlite-3_46.patch
new file mode 100644
index 0000000..51195c7
--- /dev/null
+++ b/rubygem-sqlite3-1.4.4-update-test-for-sqlite-3_46.patch
@@ -0,0 +1,23 @@
+From 8073d6f093f5dbd71860c38dc79751c56a83f3ef Mon Sep 17 00:00:00 2001
+From: Mike Dalessio <mike.dalessio@gmail.com>
+Date: Wed, 7 Feb 2024 09:40:22 -0500
+Subject: [PATCH] test: update tests to accommodate changed error messages
+
+see sqlite/sqlite@a67d63b4
+---
+ test/test_database.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_database.rb b/test/test_database.rb
+index 084a641d..5c902eed 100644
+--- a/test/test_database.rb
++++ b/test/test_database.rb
+@@ -525,7 +525,7 @@
+       error = assert_raises SQLite3::SQLException do
+         db.execute('create index index_numbers_nope ON numbers ("nope");')
+       end
+-      assert_includes error.message, "no such column: nope"
++      assert_match(/no such column: "?nope"?/, error.message)
+     end
+   end
+ end
diff --git a/rubygem-sqlite3.spec b/rubygem-sqlite3.spec
index 70bad67..0ce39dc 100644
--- a/rubygem-sqlite3.spec
+++ b/rubygem-sqlite3.spec
@@ -1,11 +1,14 @@
 %global gem_name sqlite3
 Name:                rubygem-%{gem_name}
 Version:             1.4.4
-Release:             1
+Release:             2
 Summary:             Allows Ruby scripts to interface with a SQLite3 database
 License:             BSD-3-Clause
 URL:                 https://github.com/sparklemotion/sqlite3-ruby
 Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# Upstream fix for update test with sqlite 3.46 error msg change
+# https://github.com/sparklemotion/sqlite3-ruby/pull/504
+Patch1: rubygem-sqlite3-1.4.4-update-test-for-sqlite-3_46.patch
 BuildRequires:       ruby(release) rubygems-devel ruby-devel sqlite-devel rubygem(minitest) >= 5.0.0
 BuildRequires:       gcc
 %description
@@ -21,7 +24,7 @@ BuildArch:           noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version}
+%autosetup -p1 -n %{gem_name}-%{version}
 
 %build
 gem build ../%{gem_name}-%{version}.gemspec
@@ -65,6 +68,9 @@ popd
 %{gem_instdir}/test
 
 %changelog
+* Fri Jan 03 2025 Funda Wang <fundawang@yeah.net> - 1.4.4-2
+- fix build with sqlite 3.46
+
 * Thu Jul 28 2022 liqiuyu <liqiuyu@kylinos.cn> - 1.4.4-1
 - update to 1.4.4
 
-- 
Gitee