From 8a07f13e7f6ade8b1f7b93ba890131bcea841d95 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 29 Sep 2024 19:58:13 +0200 Subject: [PATCH] Drop unused support for sqlcipher --- rusqlite-fix-metadata.diff | 12 +++++++++--- rust-rusqlite.spec | 25 +------------------------ rust2rpm.toml | 8 ++++++++ 3 files changed, 18 insertions(+), 27 deletions(-) create mode 100644 rust2rpm.toml diff --git a/rusqlite-fix-metadata.diff b/rusqlite-fix-metadata.diff index 4c6db82..8974877 100644 --- a/rusqlite-fix-metadata.diff +++ b/rusqlite-fix-metadata.diff @@ -1,5 +1,5 @@ --- rusqlite-0.31.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ rusqlite-0.31.0/Cargo.toml 2024-04-09T16:34:26.176887+00:00 ++++ rusqlite-0.31.0/Cargo.toml 2024-09-29T17:57:46.314502+00:00 @@ -67,7 +67,6 @@ name = "load_extension" required-features = [ @@ -66,11 +66,17 @@ release_memory = [] serialize = ["modern_sqlite"] series = ["vtab"] -@@ -241,7 +214,6 @@ +@@ -237,13 +210,10 @@ + "libsqlite3-sys/session", + "hooks", + ] +-sqlcipher = ["libsqlite3-sys/sqlcipher"] trace = [] unlock_notify = ["libsqlite3-sys/unlock_notify"] vtab = [] -wasm32-wasi-vfs = ["libsqlite3-sys/wasm32-wasi-vfs"] window = ["functions"] - with-asan = ["libsqlite3-sys/with-asan"] +-with-asan = ["libsqlite3-sys/with-asan"] + [badges.appveyor] + repository = "rusqlite/rusqlite" diff --git a/rust-rusqlite.spec b/rust-rusqlite.spec index 14732ef..3aa48c7 100644 --- a/rust-rusqlite.spec +++ b/rust-rusqlite.spec @@ -16,6 +16,7 @@ Source: %{crates_source} # * drop features for building with bundled dependencies # * drop Windows- and WASM-specific features and dependencies # * drop unused optional rusqlite_macros dependency +# * drop unused support for sqlcipher Patch: rusqlite-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 @@ -315,18 +316,6 @@ use the "session" feature of the "%{crate}" crate. %files -n %{name}+session-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+sqlcipher-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+sqlcipher-devel %{_description} - -This package contains library source intended for building other packages which -use the "sqlcipher" feature of the "%{crate}" crate. - -%files -n %{name}+sqlcipher-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+time-devel Summary: %{summary} BuildArch: noarch @@ -411,18 +400,6 @@ use the "window" feature of the "%{crate}" crate. %files -n %{name}+window-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+with-asan-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+with-asan-devel %{_description} - -This package contains library source intended for building other packages which -use the "with-asan" feature of the "%{crate}" crate. - -%files -n %{name}+with-asan-devel -%ghost %{crate_instdir}/Cargo.toml - %prep %autosetup -n %{crate}-%{version} -p1 %cargo_prep diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..f34a609 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,8 @@ +[package] +cargo-toml-patch-comments = [ + "drop features for building with bundled dependencies", + "drop Windows- and WASM-specific features and dependencies", + "drop unused optional rusqlite_macros dependency", + "drop unused support for sqlcipher", +] +