diff --git a/.gitignore b/.gitignore index 1a3a04c..0a20e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ /libmimalloc-sys-0.1.28.crate /libmimalloc-sys-0.1.30.crate /libmimalloc-sys-0.1.33.crate -/libmimalloc-sys-0.1.35.crate -/libmimalloc-sys-0.1.38.crate -/libmimalloc-sys-0.1.39.crate -/libmimalloc-sys-0.1.42.crate -/libmimalloc-sys-0.1.44.crate diff --git a/get-bundled-mimalloc-ver.sh b/get-bundled-mimalloc-ver.sh deleted file mode 100755 index ba2b568..0000000 --- a/get-bundled-mimalloc-ver.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -for v in 2 3; do - grep "define MI_MALLOC_VERSION" libmimalloc-sys-*/c_src/mimalloc/v$v/include/mimalloc.h | cut -d' ' -f3 | fold -w1 | paste -sd. -done diff --git a/rust-libmimalloc-sys.spec b/rust-libmimalloc-sys.spec index 82cc4f9..4b5b4b3 100644 --- a/rust-libmimalloc-sys.spec +++ b/rust-libmimalloc-sys.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 27 -%bcond check 1 +# Generated by rust2rpm 24 +%bcond_without check %global debug_package %{nil} %global crate libmimalloc-sys Name: rust-libmimalloc-sys -Version: 0.1.44 +Version: 0.1.33 Release: %autorelease Summary: Sys crate wrapping the mimalloc allocator @@ -13,14 +13,11 @@ License: MIT URL: https://crates.io/crates/libmimalloc-sys Source: %{crates_source} -BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: rust-packaging >= 21 # TODO: get this to build against system mimalloc # or ask mimalloc dev to switch to mimalloc-sys -# https://github.com/purpleprotocol/mimalloc_rust/issues/73 -# use get-bundled-mimalloc-ver.sh after unpacking the crate -Provides: bundled(mimalloc) = 2.2.4 -Provides: bundled(mimalloc) = 3.1.5 +Provides: bundled(mimalloc) = 2.1.2 %global _description %{expand: Sys crate wrapping the mimalloc allocator.} @@ -38,8 +35,7 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE.txt -%license %{crate_instdir}/c_src/mimalloc/v2/LICENSE -%license %{crate_instdir}/c_src/mimalloc/v3/LICENSE +%license %{crate_instdir}/c_src/mimalloc/LICENSE %{crate_instdir}/ %package -n %{name}+default-devel @@ -54,18 +50,6 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+arena-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+arena-devel %{_description} - -This package contains library source intended for building other packages which -use the "arena" feature of the "%{crate}" crate. - -%files -n %{name}+arena-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+cty-devel Summary: %{summary} BuildArch: noarch @@ -126,18 +110,6 @@ use the "local_dynamic_tls" feature of the "%{crate}" crate. %files -n %{name}+local_dynamic_tls-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+no_thp-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+no_thp-devel %{_description} - -This package contains library source intended for building other packages which -use the "no_thp" feature of the "%{crate}" crate. - -%files -n %{name}+no_thp-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+override-devel Summary: %{summary} BuildArch: noarch @@ -162,20 +134,11 @@ use the "secure" feature of the "%{crate}" crate. %files -n %{name}+secure-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+v3-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+v3-devel %{_description} - -This package contains library source intended for building other packages which -use the "v3" feature of the "%{crate}" crate. - -%files -n %{name}+v3-devel -%ghost %{crate_instdir}/Cargo.toml - %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 +# these are Windows .exe and .dlls, and unneeded +# see build.rs for the ones that are actually referenced +rm -r c_src/mimalloc/bin %cargo_prep %generate_buildrequires diff --git a/sources b/sources index c39a392..960830a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmimalloc-sys-0.1.44.crate) = 18de89a1084ed2da37f9ea6357289e40fe95d86e8de2ee4567bba5453c2f622a116473e2baffeb086cdf814a4b7b12f6e05563992b0b88cf939abcc5a2584fc2 +SHA512 (libmimalloc-sys-0.1.33.crate) = ac2161b4324436ff55b421bd5d26c5c3a54da62319299b392f9aaebd65dcd5862b8f8488738959e7e45be3165259b251643416ddd9905ddf6580807136c71616