6.0.12

asusctl.spec

@@ -6,6 +6,7 @@
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
 
 %define vendor_id 386fd37e8a3185dba7ec57dacdb025fc
+%define rustver 1.83.0
 
 Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 Name:           asusctl
@@ -20,12 +21,11 @@ Source1:        https://gitlab.com/-/project/20328305/uploads/%{vendor_id}/vendo
 Source2:        cargo_config
 Source1000:     %{name}.rpmlintrc
 Patch0:         %{name}-makefile.patch
-BuildRequires:  cargo
-#BuildRequires:  rust-packaging
-BuildRequires:  clang-devel
-BuildRequires:  cmake
+%if %{mdvver} > 201610
 BuildRequires:  rust
-BuildRequires:  rust-std-static
+BuildRequires:  cargo
+%endif
+BuildRequires:  cmake
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -33,6 +33,8 @@ BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:	pkgconfig(systemd)
 BuildRequires:  desktop-file-utils
 BuildRequires:  imagemagick
+BuildRequires:  curl
+BuildRequires:  git-core
 Requires: %{_lib}appindicator3-gir0.1
 Recommends: power-profiles-daemon
 
@@ -91,7 +93,7 @@ a notification service, and ability to run in the background.
 %setup -q
 #setup -D -T -a 1
 
-%patch0 -p1
+#patch0 -p1
 
 #mv Cargo.lock{,.bak}
 #cargo_prep
@@ -99,16 +101,29 @@ a notification service, and ability to run in the background.
 #sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
 #cat %{SOURCE2} >> .cargo/config
 
+%if %{mdvver} <= 201610
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |\
+        sh -s -- -y --profile default --default-toolchain %{rustver}
+%endif
+
+
+
+
 %build
-export RUSTFLAGS="%{rustflags}"
+#export RUSTFLAGS="%{rustflags}"
 #cargo_build
+
+%if %{mdvver} <= 201610
+source "$HOME/.cargo/env"
+%endif
+
 cargo build --release
 #--frozen 
 #--offline 
 #--config .cargo/config.toml
 
 %install
-export RUSTFLAGS="%{rustflags}"
+#export RUSTFLAGS="%{rustflags}"
 #mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
 %make_install