diff --git a/.gitignore b/.gitignore index 2937c19..dd71539 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /rusqlite-0.24.2.crate /rusqlite-0.26.1.crate /rusqlite-0.26.3.crate +/rusqlite-0.28.0.crate diff --git a/rusqlite-fix-metadata.diff b/rusqlite-fix-metadata.diff index c9c1395..17f67e7 100644 --- a/rusqlite-fix-metadata.diff +++ b/rusqlite-fix-metadata.diff @@ -1,40 +1,56 @@ ---- rusqlite-0.26.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ rusqlite-0.26.3/Cargo.toml 2021-12-09T14:58:52.648947+00:00 -@@ -21,6 +21,7 @@ - categories = ["database"] - license = "MIT" - repository = "https://github.com/rusqlite/rusqlite" -+exclude = ["appveyor.yml", "clippy.toml", "codecov.yml", "publish-ghp-docs.sh", "test.csv"] - [package.metadata.docs.rs] - all-features = false - default-target = "x86_64-unknown-linux-gnu" -@@ -135,11 +136,6 @@ +--- rusqlite-0.28.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rusqlite-0.28.0/Cargo.toml 2023-03-07T15:19:02.944935+00:00 +@@ -149,23 +149,6 @@ backup = ["libsqlite3-sys/min_sqlite_version_3_6_23"] blob = ["libsqlite3-sys/min_sqlite_version_3_7_7"] buildtime_bindgen = ["libsqlite3-sys/buildtime_bindgen"] --bundled = ["libsqlite3-sys/bundled", "modern_sqlite"] --bundled-full = ["modern-full", "bundled"] --bundled-sqlcipher = ["libsqlite3-sys/bundled-sqlcipher", "bundled"] --bundled-sqlcipher-vendored-openssl = ["libsqlite3-sys/bundled-sqlcipher-vendored-openssl", "bundled-sqlcipher"] +-bundled = [ +- "libsqlite3-sys/bundled", +- "modern_sqlite", +-] +-bundled-full = [ +- "modern-full", +- "bundled", +-] +-bundled-sqlcipher = [ +- "libsqlite3-sys/bundled-sqlcipher", +- "bundled", +-] +-bundled-sqlcipher-vendored-openssl = [ +- "libsqlite3-sys/bundled-sqlcipher-vendored-openssl", +- "bundled-sqlcipher", +-] -bundled-windows = ["libsqlite3-sys/bundled-windows"] collation = [] column_decltype = [] - csvtab = ["csv", "vtab"] -@@ -151,16 +147,14 @@ + csvtab = [ +@@ -176,10 +159,6 @@ + functions = ["libsqlite3-sys/min_sqlite_version_3_7_7"] + hooks = [] + i128_blob = [] +-in_gecko = [ +- "modern_sqlite", +- "libsqlite3-sys/in_gecko", +-] limits = [] load_extension = [] - modern-full = ["array", "backup", "blob", "modern_sqlite", "chrono", "collation", "column_decltype", "csvtab", "extra_check", "functions", "hooks", "i128_blob", "limits", "load_extension", "serde_json", "series", "time", "trace", "unlock_notify", "url", "uuid", "vtab", "window"] + modern-full = [ +@@ -207,7 +186,7 @@ + "vtab", + "window", + ] -modern_sqlite = ["libsqlite3-sys/bundled_bindings"] +modern_sqlite = [] + release_memory = ["libsqlite3-sys/min_sqlite_version_3_7_16"] series = ["vtab"] - session = ["libsqlite3-sys/session", "hooks"] - sqlcipher = ["libsqlite3-sys/sqlcipher"] + session = [ +@@ -218,9 +197,7 @@ trace = ["libsqlite3-sys/min_sqlite_version_3_6_23"] unlock_notify = ["libsqlite3-sys/unlock_notify"] - vtab = ["libsqlite3-sys/min_sqlite_version_3_7_7", "lazy_static"] + vtab = ["libsqlite3-sys/min_sqlite_version_3_7_7"] -wasm32-wasi-vfs = ["libsqlite3-sys/wasm32-wasi-vfs"] window = ["functions"] -winsqlite3 = ["libsqlite3-sys/winsqlite3"] with-asan = ["libsqlite3-sys/with-asan"] + [badges.appveyor] - repository = "rusqlite/rusqlite" diff --git a/rust-rusqlite.spec b/rust-rusqlite.spec index 66d419e..4927d53 100644 --- a/rust-rusqlite.spec +++ b/rust-rusqlite.spec @@ -1,27 +1,23 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate rusqlite -Name: rust-%{crate} -Version: 0.26.3 +Name: rust-rusqlite +Version: 0.28.0 Release: %autorelease Summary: Ergonomic wrapper for SQLite -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/rusqlite Source: %{crates_source} -# Initial patched metadata -# * exclude some files only useful for upstream development and CI -# * excise features for bundled sqlite (disabled in rust-libsqlite3-sys) +# Manually created patch for downstream crate metadata changes +# * drop features for building with bundled dependencies # * drop Windows- and WASM-specific features and dependencies -Patch0: rusqlite-fix-metadata.diff +Patch: rusqlite-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Ergonomic wrapper for SQLite.} @@ -38,9 +34,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE -%doc Changelog.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -52,7 +48,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}+array-devel Summary: %{summary} @@ -64,7 +60,7 @@ This package contains library source intended for building other packages which use the "array" feature of the "%{crate}" crate. %files -n %{name}+array-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+backup-devel Summary: %{summary} @@ -76,7 +72,7 @@ This package contains library source intended for building other packages which use the "backup" feature of the "%{crate}" crate. %files -n %{name}+backup-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+blob-devel Summary: %{summary} @@ -88,7 +84,7 @@ This package contains library source intended for building other packages which use the "blob" feature of the "%{crate}" crate. %files -n %{name}+blob-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+buildtime_bindgen-devel Summary: %{summary} @@ -100,19 +96,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 - -%package -n %{name}+byteorder-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+byteorder-devel %{_description} - -This package contains library source intended for building other packages which -use the "byteorder" feature of the "%{crate}" crate. - -%files -n %{name}+byteorder-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+chrono-devel Summary: %{summary} @@ -124,7 +108,7 @@ This package contains library source intended for building other packages which use the "chrono" feature of the "%{crate}" crate. %files -n %{name}+chrono-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+collation-devel Summary: %{summary} @@ -136,7 +120,7 @@ This package contains library source intended for building other packages which use the "collation" feature of the "%{crate}" crate. %files -n %{name}+collation-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+column_decltype-devel Summary: %{summary} @@ -148,7 +132,7 @@ This package contains library source intended for building other packages which use the "column_decltype" feature of the "%{crate}" crate. %files -n %{name}+column_decltype-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+csv-devel Summary: %{summary} @@ -160,7 +144,7 @@ This package contains library source intended for building other packages which use the "csv" feature of the "%{crate}" crate. %files -n %{name}+csv-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+csvtab-devel Summary: %{summary} @@ -172,7 +156,7 @@ This package contains library source intended for building other packages which use the "csvtab" feature of the "%{crate}" crate. %files -n %{name}+csvtab-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+extra_check-devel Summary: %{summary} @@ -184,7 +168,7 @@ This package contains library source intended for building other packages which use the "extra_check" feature of the "%{crate}" crate. %files -n %{name}+extra_check-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+functions-devel Summary: %{summary} @@ -196,7 +180,7 @@ This package contains library source intended for building other packages which use the "functions" feature of the "%{crate}" crate. %files -n %{name}+functions-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+hooks-devel Summary: %{summary} @@ -208,7 +192,7 @@ This package contains library source intended for building other packages which use the "hooks" feature of the "%{crate}" crate. %files -n %{name}+hooks-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+i128_blob-devel Summary: %{summary} @@ -220,19 +204,7 @@ This package contains library source intended for building other packages which use the "i128_blob" feature of the "%{crate}" crate. %files -n %{name}+i128_blob-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+in_gecko-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+in_gecko-devel %{_description} - -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}+lazy_static-devel Summary: %{summary} @@ -244,7 +216,7 @@ This package contains library source intended for building other packages which use the "lazy_static" feature of the "%{crate}" crate. %files -n %{name}+lazy_static-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+limits-devel Summary: %{summary} @@ -256,7 +228,7 @@ This package contains library source intended for building other packages which use the "limits" feature of the "%{crate}" crate. %files -n %{name}+limits-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+load_extension-devel Summary: %{summary} @@ -268,7 +240,7 @@ This package contains library source intended for building other packages which use the "load_extension" feature of the "%{crate}" crate. %files -n %{name}+load_extension-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+modern-full-devel Summary: %{summary} @@ -280,7 +252,7 @@ This package contains library source intended for building other packages which use the "modern-full" feature of the "%{crate}" crate. %files -n %{name}+modern-full-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+modern_sqlite-devel Summary: %{summary} @@ -292,7 +264,19 @@ This package contains library source intended for building other packages which use the "modern_sqlite" feature of the "%{crate}" crate. %files -n %{name}+modern_sqlite-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+release_memory-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+release_memory-devel %{_description} + +This package contains library source intended for building other packages which +use the "release_memory" feature of the "%{crate}" crate. + +%files -n %{name}+release_memory-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde_json-devel Summary: %{summary} @@ -304,7 +288,7 @@ This package contains library source intended for building other packages which use the "serde_json" feature of the "%{crate}" crate. %files -n %{name}+serde_json-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+series-devel Summary: %{summary} @@ -316,7 +300,7 @@ This package contains library source intended for building other packages which use the "series" feature of the "%{crate}" crate. %files -n %{name}+series-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+session-devel Summary: %{summary} @@ -328,7 +312,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} @@ -340,7 +324,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}+time-devel Summary: %{summary} @@ -352,7 +336,7 @@ This package contains library source intended for building other packages which use the "time" feature of the "%{crate}" crate. %files -n %{name}+time-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+trace-devel Summary: %{summary} @@ -364,7 +348,7 @@ This package contains library source intended for building other packages which use the "trace" feature of the "%{crate}" crate. %files -n %{name}+trace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unlock_notify-devel Summary: %{summary} @@ -376,7 +360,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}+url-devel Summary: %{summary} @@ -388,7 +372,7 @@ This package contains library source intended for building other packages which use the "url" feature of the "%{crate}" crate. %files -n %{name}+url-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+uuid-devel Summary: %{summary} @@ -400,7 +384,7 @@ This package contains library source intended for building other packages which use the "uuid" feature of the "%{crate}" crate. %files -n %{name}+uuid-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+vtab-devel Summary: %{summary} @@ -412,7 +396,7 @@ This package contains library source intended for building other packages which use the "vtab" feature of the "%{crate}" crate. %files -n %{name}+vtab-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+window-devel Summary: %{summary} @@ -424,7 +408,7 @@ This package contains library source intended for building other packages which use the "window" feature of the "%{crate}" crate. %files -n %{name}+window-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+with-asan-devel Summary: %{summary} @@ -436,7 +420,7 @@ 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 diff --git a/sources b/sources index fbf9dfc..3d6cef2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rusqlite-0.26.3.crate) = 1d8ae38d3863530a941da111045a7d4e785c24e01ce34f38573eec9d8faad91ffdbe9ebd32e8f812522db304ea56c1dd08b3cb0482ae7a688ce56799df07239e +SHA512 (rusqlite-0.28.0.crate) = a38205b2437ffb50bf8a14304b4a30a62993957a348f03b37d09fabb9269fcbdb35dafab496f7cecdcefb7353720ffc0580822d9b231e0f75cee23b6f7344857