4.7.1

.abf.yml

@@ -1,3 +1,5 @@
 sources:
   asusctl-4.7.0.tar.gz: d51fd20c03cfd3bed66fbe9f466517ea8e9299c7
   vendor_asusctl_4.7.0.tar.xz: 77a74cd9f34a5194f3ef63518eee28f8c094df94
+  asusctl-4.7.1.tar.gz: d81a4a48bd26c9ed488b68f5b5fbffebc6a4c61e
+  vendor-asusctl-4.7.1.tar.gz: 314744d1871281a0717195e7e5b0ac4b06a47d80

asusctl.rpmlintrc

@@ -0,0 +1,2 @@
+addFilter("E: explicit-lib-dependency")
+

asusctl.spec

@@ -7,16 +7,18 @@
 
 Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 Name:           asusctl
-Version:        4.7.0
+Version:        4.7.1
 Release:        1
 License:        MPLv2
 Group:          System/Kernel and hardware
 URL:            https://gitlab.com/asus-linux/asusctl
 Source0:         %{name}-%{version}.tar.gz
-Source1:        vendor_%{name}_%{version}.tar.xz
+Source1:        vendor-%{name}-%{version}.tar.gz
 Source2:        cargo_config
+Source1000:     %{name}.rpmlintrc
+Patch0:         %{name}-makefile.patch
 BuildRequires:  cargo
-BuildRequires:  rust-packaging
+#BuildRequires:  rust-packaging
 BuildRequires:  clang-devel
 BuildRequires:  cmake
 BuildRequires:  rust
@@ -27,6 +29,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:	pkgconfig(systemd)
 BuildRequires:  desktop-file-utils
+BuildRequires:  imagemagick
 Requires: %{_lib}appindicator3-gir0.1
 Recommends: power-profiles-daemon
 
@@ -39,27 +42,26 @@ fan speeds, keyboard LEDs, battery charge level, and graphics modes.
 asus-nb-ctrl enables third-party apps to use the above with dbus methods.
 
 %files
-%license LICENSE
+%doc LICENSE README.md
 %{_bindir}/asusd
 %{_bindir}/asusd-user
 %{_bindir}/asusctl
 %{_userunitdir}/asusd-user.service
-%{_prefix}/lib/systemd/system/asusd.service
-%{_prefix}/lib/udev/rules.d/99-asusd.rules
+%{_unitdir}/asusd.service
+%{_udevrulesdir}/99-asusd.rules
 %{_datadir}/dbus-1/system.d/asusd.conf
-%{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png
-%{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png
-%{_datadir}/icons/hicolor/512x512/apps/asus_notif_red.png
-%{_datadir}/icons/hicolor/512x512/apps/asus_notif_blue.png
-%{_datadir}/icons/hicolor/512x512/apps/asus_notif_orange.png
-%{_datadir}/icons/hicolor/512x512/apps/asus_notif_white.png
+%{_datadir}/icons/hicolor/*/apps/asus_notif_yellow.png
+%{_datadir}/icons/hicolor/*/apps/asus_notif_green.png
+%{_datadir}/icons/hicolor/*/apps/asus_notif_red.png
+%{_datadir}/icons/hicolor/*/apps/asus_notif_blue.png
+%{_datadir}/icons/hicolor/*/apps/asus_notif_orange.png
+%{_datadir}/icons/hicolor/*/apps/asus_notif_white.png
 %{_datadir}/icons/hicolor/scalable/status/gpu-compute.svg
 %{_datadir}/icons/hicolor/scalable/status/gpu-hybrid.svg
 %{_datadir}/icons/hicolor/scalable/status/gpu-integrated.svg
 %{_datadir}/icons/hicolor/scalable/status/gpu-nvidia.svg
 %{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg
 %{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg
-%{_docdir}/%{name}/
 %{_datadir}/asusd/
 
 #-----------------------------------------------------------------------
@@ -73,35 +75,62 @@ A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls,
 a notification service, and ability to run in the background.
 
 %files rog-gui
+%doc LICENSE rog-anime/README.md rog-anime/data/diagonal-template.png
 %{_bindir}/rog-control-center
 %{_datadir}/applications/rog-control-center.desktop
-%{_datadir}/icons/hicolor/512x512/apps/rog-control-center.png
+%{_datadir}/icons/hicolor/*/apps/rog-control-center.png
 %{_datadir}/rog-gui
 
 #-----------------------------------------------------------------------
 
 %prep
-%autosetup
-%setup -D -T -a 1
+#autosetup
+%setup -q
+#setup -D -T -a 1
 
-mv Cargo.lock{,.bak}
-%cargo_prep
-mv Cargo.lock{.bak,}
-sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
-cat %{SOURCE2} >> .cargo/config
+%patch0 -p1
+
+#mv Cargo.lock{,.bak}
+#cargo_prep
+#mv Cargo.lock{.bak,}
+#sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
+#cat %{SOURCE2} >> .cargo/config
 
 %build
 export RUSTFLAGS="%{rustflags}"
-%cargo_build
-#cargo build --release --frozen --offline --config .cargo/config.toml
+#cargo_build
+cargo build --release
+#--frozen 
+#--offline 
+#--config .cargo/config.toml
 
 %install
 export RUSTFLAGS="%{rustflags}"
-mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
+#mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
 %make_install
 
-install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
-install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
-install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png
+# install icons
+for x in 16 24 32 48 64 96 128 256; do
+install -d %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/
+
+pushd data/icons
+convert -resize ${x}x${x} asus_notif_yellow.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/asus_notif_yellow.png
+convert -resize ${x}x${x} asus_notif_green.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/asus_notif_green.png
+convert -resize ${x}x${x} asus_notif_red.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/asus_notif_red.png
+convert -resize ${x}x${x} asus_notif_blue.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/asus_notif_blue.png
+convert -resize ${x}x${x} asus_notif_orange.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/asus_notif_orange.png
+convert -resize ${x}x${x} asus_notif_white.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/asus_notif_white.png
+popd
+
+pushd rog-control-center/data
+convert -resize ${x}x${x} rog-control-center.png %{buildroot}%{_iconsdir}/hicolor/${x}x${x}/apps/rog-control-center.png
+popd
+
+done
+
+# install unit service && udev roles
+install -Dm0644 data/asusd.rules %{buildroot}%{_udevrulesdir}/99-asusd.rules
+install -Dm0644 data/asusd.service %{buildroot}%{_unitdir}/asusd.service
+
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop