[steam/f25: 2/2] Do not require libtxc_dxtn on Fedora 28+ (Mesa 17.3.0+), update udev rules

commit 4e95d5b9382cebc6be761470a198ca3ab33806f9 Author: Simone Caronni <negativo17(a)gmail.com&gt; Date: Thu Nov 16 11:27:00 2017 +0100 Do not require libtxc_dxtn on Fedora 28+ (Mesa 17.3.0+), update udev rules 51-these-are-not-joysticks-rm.rules | 10 ++++++---- README.Fedora | 2 ++ steam.spec | 16 +++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) --- diff --git a/51-these-are-not-joysticks-rm.rules b/51-these-are-not-joysticks-rm.rules index 446c4ab..2e7e25d 100644 --- a/51-these-are-not-joysticks-rm.rules +++ b/51-these-are-not-joysticks-rm.rules @@ -19,18 +19,18 @@ SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", ENV{ID_IN SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" -SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" -SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" -SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" -SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0019", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0019", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00d1", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00d1", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="030e", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="030e", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="054f", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="054f", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="1410", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="1410", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3043", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="3043", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="31b5", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" @@ -49,6 +49,8 @@ SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="7f2d", ENV{ID_IN SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="7f2d", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="8090", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="8090", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9033", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" +SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9033", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9066", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9066", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}="" SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="9090", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}="" diff --git a/README.Fedora b/README.Fedora index 93cafb7..6d61335 100644 --- a/README.Fedora +++ b/README.Fedora @@ -94,6 +94,7 @@ The package contains the UDEV rules for the following devices: - Wacom CTE-650 Bamboo Fun 6x8 - Wacom CTE-631 Bamboo One - Wacom Bamboo Pen and Touch CTH-460 +- Wacom Intuos Pen (S) CTL-480 - A4 Tech Co., G7 750 mouse - A4 Tech Co., Ltd Bloody R8A Gaming Mouse - A4 Tech Co., Ltd Bloody TL80 Terminator Laser Gaming Mouse @@ -108,6 +109,7 @@ The package contains the UDEV rules for the following devices: - A4 Tech Co., Ltd XL-730K / XL-750BK / XL-755BK Laser Mouse - A4 Tech Co., Ltd X7 G800V keyboard - A4 Tech Co., Ltd Bloody V7 mouse +- A4 Tech Co., Ltd Bloody AL9 mouse - A4 Tech Co., Ltd Bloody B540 keyboard - A4 Tech Co., Ltd Bloody V2 mouse - A4 Tech Co., Ltd Bloody B120 Keyboard diff --git a/steam.spec b/steam.spec index 1478824..844458a 100644 --- a/steam.spec +++ b/steam.spec @@ -6,7 +6,7 @@ Name: steam Version: 1.0.0.54 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Installer for the Steam software distribution service # Redistribution and repackaging for Linux is allowed, see license file License: Steam License Agreement @@ -46,8 +46,10 @@ BuildRequires: systemd Requires: tar Requires: zenity +%if 0%{?fedora} == 25 || 0%{?fedora} == 26 || 0%{?fedora} == 27 || 0%{?rhel} == 7 # Required for S3 compressed textures on free drivers (intel/radeon/nouveau) Requires: libtxc_dxtn%{?_isa} +%endif # Required for running the package on 32 bit systems with free drivers Requires: mesa-dri-drivers%{?_isa} @@ -138,21 +140,19 @@ install -D -m 644 -p %{SOURCE3} \ mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d -%if 0%{?fedora} >= 25 # Install AppData mkdir -p %{buildroot}%{_datadir}/appdata install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/ -%endif %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%if 0%{?fedora} == 24 || 0%{?rhel} == 7 +%if 0%{?rhel} == 7 /usr/bin/update-desktop-database &> /dev/null || : %endif %firewalld_reload %postun -%if 0%{?fedora} == 24 || 0%{?rhel} == 7 +%if 0%{?rhel} == 7 /usr/bin/update-desktop-database &> /dev/null || : %endif if [ $1 -eq 0 ] ; then @@ -168,9 +168,7 @@ fi %license COPYING steam_install_agreement.txt %doc README debian/changelog README.Fedora %{_bindir}/%{name} -%if 0%{?fedora} >= 25 %{_datadir}/appdata/%{name}.appdata.xml -%endif %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/pixmaps/%{name}.png @@ -182,6 +180,10 @@ fi %{_udevrulesdir}/* %changelog +* Thu Nov 16 2017 Simone Caronni <negativo17(a)gmail.com&gt; - 1.0.0.54-12 +- Do not require libtxc_dxtn on Fedora 28+ (Mesa 17.3.0+). +- Update udev rules. + * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 1.0.0.54-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild