diff --git a/.rust2rpm.conf b/.rust2rpm.conf deleted file mode 100644 index d1b1d28..0000000 --- a/.rust2rpm.conf +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -unwanted-features = - bigdecimal - extras - mysql - mysqlclient-sys - num-bigint - numeric - quickcheck - unstable - uuid diff --git a/diesel-fix-metadata.diff b/diesel-fix-metadata.diff index 05016a7..5d1cdd3 100644 --- a/diesel-fix-metadata.diff +++ b/diesel-fix-metadata.diff @@ -1,5 +1,5 @@ --- diesel-1.4.8/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ diesel-1.4.8/Cargo.toml 2021-11-13T17:23:34.164607+00:00 ++++ diesel-1.4.8/Cargo.toml 2023-06-13T15:23:28.499958+00:00 @@ -52,7 +52,7 @@ optional = true diff --git a/rust-diesel.spec b/rust-diesel.spec index b56f6ce..7f4f5a2 100644 --- a/rust-diesel.spec +++ b/rust-diesel.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 24 # * dev-dependencies are outdated: # https://github.com/diesel-rs/diesel/issues/2393 %bcond_with check @@ -6,28 +6,23 @@ %global crate diesel -Name: rust-%{crate} +Name: rust-diesel Version: 1.4.8 Release: %autorelease Summary: Safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/diesel Source: %{crates_source} -# Initial patched metadata -# * Bump libsqlite3-sys to 0.25.0 -Patch0: diesel-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * bump allowed libsqlite3-sys versions to <0.26 +Patch: diesel-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL.} +A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and +MySQL.} %description %{_description} @@ -37,13 +32,14 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -51,11 +47,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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}+128-column-tables-devel Summary: %{summary} @@ -63,11 +59,11 @@ BuildArch: noarch %description -n %{name}+128-column-tables-devel %{_description} -This package contains library source intended for building other packages -which use "128-column-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "128-column-tables" feature of the "%{crate}" crate. %files -n %{name}+128-column-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+32-column-tables-devel Summary: %{summary} @@ -75,11 +71,11 @@ BuildArch: noarch %description -n %{name}+32-column-tables-devel %{_description} -This package contains library source intended for building other packages -which use "32-column-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "32-column-tables" feature of the "%{crate}" crate. %files -n %{name}+32-column-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+64-column-tables-devel Summary: %{summary} @@ -87,11 +83,11 @@ BuildArch: noarch %description -n %{name}+64-column-tables-devel %{_description} -This package contains library source intended for building other packages -which use "64-column-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "64-column-tables" feature of the "%{crate}" crate. %files -n %{name}+64-column-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+bitflags-devel Summary: %{summary} @@ -99,11 +95,11 @@ BuildArch: noarch %description -n %{name}+bitflags-devel %{_description} -This package contains library source intended for building other packages -which use "bitflags" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bitflags" feature of the "%{crate}" crate. %files -n %{name}+bitflags-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+chrono-devel Summary: %{summary} @@ -111,11 +107,11 @@ BuildArch: noarch %description -n %{name}+chrono-devel %{_description} -This package contains library source intended for building other packages -which use "chrono" feature of "%{crate}" crate. +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}+deprecated-time-devel Summary: %{summary} @@ -123,11 +119,11 @@ BuildArch: noarch %description -n %{name}+deprecated-time-devel %{_description} -This package contains library source intended for building other packages -which use "deprecated-time" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "deprecated-time" feature of the "%{crate}" crate. %files -n %{name}+deprecated-time-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+huge-tables-devel Summary: %{summary} @@ -135,11 +131,11 @@ BuildArch: noarch %description -n %{name}+huge-tables-devel %{_description} -This package contains library source intended for building other packages -which use "huge-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "huge-tables" feature of the "%{crate}" crate. %files -n %{name}+huge-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+ipnetwork-devel Summary: %{summary} @@ -147,11 +143,11 @@ BuildArch: noarch %description -n %{name}+ipnetwork-devel %{_description} -This package contains library source intended for building other packages -which use "ipnetwork" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "ipnetwork" feature of the "%{crate}" crate. %files -n %{name}+ipnetwork-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+large-tables-devel Summary: %{summary} @@ -159,11 +155,11 @@ BuildArch: noarch %description -n %{name}+large-tables-devel %{_description} -This package contains library source intended for building other packages -which use "large-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "large-tables" feature of the "%{crate}" crate. %files -n %{name}+large-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+libc-devel Summary: %{summary} @@ -171,11 +167,11 @@ BuildArch: noarch %description -n %{name}+libc-devel %{_description} -This package contains library source intended for building other packages -which use "libc" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "libc" feature of the "%{crate}" crate. %files -n %{name}+libc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+libsqlite3-sys-devel Summary: %{summary} @@ -183,11 +179,11 @@ BuildArch: noarch %description -n %{name}+libsqlite3-sys-devel %{_description} -This package contains library source intended for building other packages -which use "libsqlite3-sys" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "libsqlite3-sys" feature of the "%{crate}" crate. %files -n %{name}+libsqlite3-sys-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+network-address-devel Summary: %{summary} @@ -195,11 +191,11 @@ BuildArch: noarch %description -n %{name}+network-address-devel %{_description} -This package contains library source intended for building other packages -which use "network-address" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "network-address" feature of the "%{crate}" crate. %files -n %{name}+network-address-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+num-integer-devel Summary: %{summary} @@ -207,11 +203,11 @@ BuildArch: noarch %description -n %{name}+num-integer-devel %{_description} -This package contains library source intended for building other packages -which use "num-integer" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "num-integer" feature of the "%{crate}" crate. %files -n %{name}+num-integer-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+num-traits-devel Summary: %{summary} @@ -219,11 +215,11 @@ BuildArch: noarch %description -n %{name}+num-traits-devel %{_description} -This package contains library source intended for building other packages -which use "num-traits" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "num-traits" feature of the "%{crate}" crate. %files -n %{name}+num-traits-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+postgres-devel Summary: %{summary} @@ -231,11 +227,11 @@ BuildArch: noarch %description -n %{name}+postgres-devel %{_description} -This package contains library source intended for building other packages -which use "postgres" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "postgres" feature of the "%{crate}" crate. %files -n %{name}+postgres-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+pq-sys-devel Summary: %{summary} @@ -243,11 +239,11 @@ BuildArch: noarch %description -n %{name}+pq-sys-devel %{_description} -This package contains library source intended for building other packages -which use "pq-sys" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "pq-sys" feature of the "%{crate}" crate. %files -n %{name}+pq-sys-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+r2d2-devel Summary: %{summary} @@ -255,11 +251,11 @@ BuildArch: noarch %description -n %{name}+r2d2-devel %{_description} -This package contains library source intended for building other packages -which use "r2d2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "r2d2" feature of the "%{crate}" crate. %files -n %{name}+r2d2-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde_json-devel Summary: %{summary} @@ -267,11 +263,11 @@ BuildArch: noarch %description -n %{name}+serde_json-devel %{_description} -This package contains library source intended for building other packages -which use "serde_json" feature of "%{crate}" crate. +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}+sqlite-devel Summary: %{summary} @@ -279,11 +275,11 @@ BuildArch: noarch %description -n %{name}+sqlite-devel %{_description} -This package contains library source intended for building other packages -which use "sqlite" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "sqlite" feature of the "%{crate}" crate. %files -n %{name}+sqlite-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+time-devel Summary: %{summary} @@ -291,11 +287,11 @@ BuildArch: noarch %description -n %{name}+time-devel %{_description} -This package contains library source intended for building other packages -which use "time" feature of "%{crate}" crate. +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}+url-devel Summary: %{summary} @@ -303,11 +299,11 @@ BuildArch: noarch %description -n %{name}+url-devel %{_description} -This package contains library source intended for building other packages -which use "url" feature of "%{crate}" crate. +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}+uuidv07-devel Summary: %{summary} @@ -315,11 +311,11 @@ BuildArch: noarch %description -n %{name}+uuidv07-devel %{_description} -This package contains library source intended for building other packages -which use "uuidv07" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "uuidv07" feature of the "%{crate}" crate. %files -n %{name}+uuidv07-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+with-deprecated-devel Summary: %{summary} @@ -327,11 +323,11 @@ BuildArch: noarch %description -n %{name}+with-deprecated-devel %{_description} -This package contains library source intended for building other packages -which use "with-deprecated" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "with-deprecated" feature of the "%{crate}" crate. %files -n %{name}+with-deprecated-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+x128-column-tables-devel Summary: %{summary} @@ -339,11 +335,11 @@ BuildArch: noarch %description -n %{name}+x128-column-tables-devel %{_description} -This package contains library source intended for building other packages -which use "x128-column-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "x128-column-tables" feature of the "%{crate}" crate. %files -n %{name}+x128-column-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+x32-column-tables-devel Summary: %{summary} @@ -351,11 +347,11 @@ BuildArch: noarch %description -n %{name}+x32-column-tables-devel %{_description} -This package contains library source intended for building other packages -which use "x32-column-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "x32-column-tables" feature of the "%{crate}" crate. %files -n %{name}+x32-column-tables-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+x64-column-tables-devel Summary: %{summary} @@ -363,11 +359,11 @@ BuildArch: noarch %description -n %{name}+x64-column-tables-devel %{_description} -This package contains library source intended for building other packages -which use "x64-column-tables" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "x64-column-tables" feature of the "%{crate}" crate. %files -n %{name}+x64-column-tables-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/rust2rpm.conf b/rust2rpm.conf new file mode 100644 index 0000000..d1b1d28 --- /dev/null +++ b/rust2rpm.conf @@ -0,0 +1,11 @@ +[DEFAULT] +unwanted-features = + bigdecimal + extras + mysql + mysqlclient-sys + num-bigint + numeric + quickcheck + unstable + uuid