diff --git a/libsqlite3-sys-fix-metadata.diff b/libsqlite3-sys-fix-metadata.diff index 69670d2..43b5ec6 100644 --- a/libsqlite3-sys-fix-metadata.diff +++ b/libsqlite3-sys-fix-metadata.diff @@ -1,6 +1,6 @@ --- libsqlite3-sys-0.28.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libsqlite3-sys-0.28.0/Cargo.toml 2024-04-09T16:26:49.840896+00:00 -@@ -26,78 +26,25 @@ ++++ libsqlite3-sys-0.28.0/Cargo.toml 2024-09-29T17:52:43.672740+00:00 +@@ -26,84 +26,28 @@ categories = ["external-ffi-bindings"] license = "MIT" repository = "https://github.com/rusqlite/rusqlite" @@ -87,9 +87,9 @@ preupdate_hook = ["buildtime_bindgen"] session = [ "preupdate_hook", -@@ -105,5 +52,4 @@ + "buildtime_bindgen", ] - sqlcipher = [] +-sqlcipher = [] unlock_notify = [] -wasm32-wasi-vfs = [] - with-asan = [] +-with-asan = [] diff --git a/rust-libsqlite3-sys.spec b/rust-libsqlite3-sys.spec index b416fea..3c5be8b 100644 --- a/rust-libsqlite3-sys.spec +++ b/rust-libsqlite3-sys.spec @@ -16,12 +16,12 @@ Source: %{crates_source} # * remove features for building vendored sqlite3 and sqlcipher sources # * drop Windows- and WASM-specific features # * exclude files that are only useful for upstream development +# * drop unused support for sqlcipher Patch: libsqlite3-sys-fix-metadata.diff # * unconditionally enable building with bindgen and pkg-config -Patch: 0001-unconditionally-enable-building-with-bindgen-and-pkg.patch +Patch1: 0001-unconditionally-enable-building-with-bindgen-and-pkg.patch BuildRequires: cargo-rpm-macros >= 24 -BuildRequires: pkgconfig(sqlcipher) BuildRequires: pkgconfig(sqlite3) >= 3.7.16 %global _description %{expand: @@ -104,19 +104,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 -Requires: pkgconfig(sqlcipher) - -%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}+unlock_notify-devel Summary: %{summary} BuildArch: noarch @@ -129,18 +116,6 @@ use the "unlock_notify" feature of the "%{crate}" crate. %files -n %{name}+unlock_notify-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 index a4c2594..5d84cac 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,7 +1,19 @@ +[package] +cargo-toml-patch-comments = [ + "remove features for building vendored sqlite3 and sqlcipher sources", + "drop Windows- and WASM-specific features", + "exclude files that are only useful for upstream development", + "drop unused support for sqlcipher", +] + +[[package.extra-patches]] +number = 1 +file = "0001-unconditionally-enable-building-with-bindgen-and-pkg.patch" +comments = ["unconditionally enable building with bindgen and pkg-config"] + [requires] -build = ["pkgconfig(sqlcipher)", "pkgconfig(sqlite3) >= 3.7.16"] +build = ["pkgconfig(sqlite3) >= 3.7.16"] lib = ["pkgconfig(sqlite3) >= 3.7.16"] -features.sqlcipher = ["pkgconfig(sqlcipher)"] [scripts] prep.post = [