diff --git a/libsqlite3-sys-fix-metadata.diff b/libsqlite3-sys-fix-metadata.diff index 856523c..caf877e 100644 --- a/libsqlite3-sys-fix-metadata.diff +++ b/libsqlite3-sys-fix-metadata.diff @@ -1,14 +1,15 @@ --- libsqlite3-sys-0.23.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libsqlite3-sys-0.23.2/Cargo.toml 2021-12-09T14:49:40.136044+00:00 -@@ -27,7 +27,6 @@ ++++ libsqlite3-sys-0.23.2/Cargo.toml 2023-02-05T14:56:54.936482+00:00 +@@ -26,7 +26,7 @@ + version = "0.9" optional = true [build-dependencies.bindgen] - version = "0.59" --features = ["runtime"] +-version = "0.59" ++version = "0.63" + features = ["runtime"] optional = true default-features = false - -@@ -39,27 +38,16 @@ +@@ -39,27 +39,16 @@ version = "0.3.19" optional = true diff --git a/rust-libsqlite3-sys.spec b/rust-libsqlite3-sys.spec index b22a47f..5584191 100644 --- a/rust-libsqlite3-sys.spec +++ b/rust-libsqlite3-sys.spec @@ -1,27 +1,25 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate libsqlite3-sys -Name: rust-%{crate} +Name: rust-libsqlite3-sys Version: 0.23.2 Release: %autorelease Summary: Native bindings to the libsqlite3 library -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/libsqlite3-sys Source: %{crates_source} -# Initial patched metadata +# Manually created patch for downstream crate metadata changes +# * bump bindgen from 0.59 to 0.63 # * remove feature for bundling sqlite and sqlcipher # * drop windows- and WASM-specific features -Patch0: libsqlite3-sys-fix-metadata.diff -Patch1: Restrict-vcpkg-feature.patch +Patch: libsqlite3-sys-fix-metadata.diff +Patch: Restrict-vcpkg-feature.patch -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Native bindings to the libsqlite3 library.} @@ -39,9 +37,10 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE sqlcipher/LICENSE -%doc README.md Upgrade.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/README.md +%doc %{crate_instdir}/Upgrade.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -53,7 +52,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+bindgen-devel Summary: %{summary} @@ -65,7 +64,7 @@ This package contains library source intended for building other packages which use the "bindgen" feature of the "%{crate}" crate. %files -n %{name}+bindgen-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+buildtime_bindgen-devel Summary: %{summary} @@ -77,7 +76,7 @@ This package contains library source intended for building other packages which use the "buildtime_bindgen" feature of the "%{crate}" crate. %files -n %{name}+buildtime_bindgen-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+cc-devel Summary: %{summary} @@ -89,7 +88,7 @@ This package contains library source intended for building other packages which use the "cc" feature of the "%{crate}" crate. %files -n %{name}+cc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+in_gecko-devel Summary: %{summary} @@ -101,7 +100,7 @@ This package contains library source intended for building other packages which use the "in_gecko" feature of the "%{crate}" crate. %files -n %{name}+in_gecko-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+min_sqlite_version_3_6_23-devel Summary: %{summary} @@ -113,7 +112,7 @@ This package contains library source intended for building other packages which use the "min_sqlite_version_3_6_23" feature of the "%{crate}" crate. %files -n %{name}+min_sqlite_version_3_6_23-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+min_sqlite_version_3_6_8-devel Summary: %{summary} @@ -125,7 +124,7 @@ This package contains library source intended for building other packages which use the "min_sqlite_version_3_6_8" feature of the "%{crate}" crate. %files -n %{name}+min_sqlite_version_3_6_8-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+min_sqlite_version_3_7_16-devel Summary: %{summary} @@ -137,7 +136,7 @@ This package contains library source intended for building other packages which use the "min_sqlite_version_3_7_16" feature of the "%{crate}" crate. %files -n %{name}+min_sqlite_version_3_7_16-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+min_sqlite_version_3_7_7-devel Summary: %{summary} @@ -149,7 +148,7 @@ This package contains library source intended for building other packages which use the "min_sqlite_version_3_7_7" feature of the "%{crate}" crate. %files -n %{name}+min_sqlite_version_3_7_7-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+openssl-sys-devel Summary: %{summary} @@ -161,7 +160,7 @@ This package contains library source intended for building other packages which use the "openssl-sys" feature of the "%{crate}" crate. %files -n %{name}+openssl-sys-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+pkg-config-devel Summary: %{summary} @@ -173,7 +172,7 @@ This package contains library source intended for building other packages which use the "pkg-config" feature of the "%{crate}" crate. %files -n %{name}+pkg-config-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+preupdate_hook-devel Summary: %{summary} @@ -185,7 +184,7 @@ This package contains library source intended for building other packages which use the "preupdate_hook" feature of the "%{crate}" crate. %files -n %{name}+preupdate_hook-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+session-devel Summary: %{summary} @@ -197,7 +196,7 @@ This package contains library source intended for building other packages which use the "session" feature of the "%{crate}" crate. %files -n %{name}+session-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+sqlcipher-devel Summary: %{summary} @@ -210,7 +209,7 @@ 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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unlock_notify-devel Summary: %{summary} @@ -222,7 +221,7 @@ This package contains library source intended for building other packages which use the "unlock_notify" feature of the "%{crate}" crate. %files -n %{name}+unlock_notify-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+with-asan-devel Summary: %{summary} @@ -234,10 +233,11 @@ 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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 +# * remove bundled copies of sqlite and sqlcipher rm -vr bindgen-bindings sqlite3 sqlcipher upgrade.sh %cargo_prep diff --git a/.rust2rpm.conf b/rust2rpm.conf similarity index 100% rename from .rust2rpm.conf rename to rust2rpm.conf