%macros

OBS-URL: https://build.opensuse.org/package/show/X11:terminals/alacritty?expand=0&rev=33

alacritty.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  4 03:45:47 UTC 2020 - Avindra Goolcharan <avindra@opensuse.org>
+
+- Use rust-packaging macros for vendoring dependencies
+- remove cargo_config
+
 -------------------------------------------------------------------
 Wed Nov 25 08:33:52 UTC 2020 - Martin Sirringhaus <martin.sirringhaus@suse.com>
 

alacritty.spec

@@ -26,15 +26,13 @@ License:        Apache-2.0
 URL:            https://github.com/alacritty/alacritty/
 Source:         https://github.com/alacritty/alacritty/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.xz
-Source2:        cargo_config
 Source3:        README.suse-maint
-BuildRequires:  cargo
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  freetype-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  pkgconfig
-BuildRequires:  rust >= 1.41.0
+BuildRequires:  rust-packaging
 BuildRequires:  update-desktop-files
 BuildRequires:  xclip
 BuildRequires:  pkgconfig(fontconfig)
@@ -71,8 +69,8 @@ The official zsh completion script for alacritty.
 
 %prep
 %setup -qa1
-mkdir .cargo
+%define cargo_registry $(pwd)/vendor
-cp %{SOURCE2} .cargo/config
+%cargo_prep
 
 %ifarch aarch64 ppc64le
 # Remove checksum of config.guess and config.sub since aarch64 and ppc64le modify them
@@ -81,7 +79,7 @@ sed -i 's#"expat/conftools/config.sub":"523cb028db907d1fbbcecdcac6737f9e2eeba48f
 %endif
 
 %build
-RUSTFLAGS=%{rustflags} cargo build --release --bin alacritty
+%cargo_build
 
 %install
 mkdir -p "%{buildroot}%{_bindir}"

cargo_config

@@ -1,15 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source."https://github.com/chrisduerr/glutin"]
-git = "https://github.com/chrisduerr/glutin"
-branch = "master"
-replace-with = "vendored-sources"
-
-[source."https://github.com/rust-windowing/winit"]
-git = "https://github.com/rust-windowing/winit"
-rev = "d1c6506865c7bddbb5fb4d80a613e43ddc1370b5"
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"