commit 7919759c888ca5154d494f7ce3f94b8d7f1b631b Author: Simone Caronni <negativo17(a)gmail.com&gt; Date: Mon Apr 20 09:41:13 2020 +0200 Update to 1.0.0.62 steam-makefile.patch | 22 ++++++++++++++++++++++ steam-no-icon-on-desktop.patch | 33 +++++++++++++++++++++++++++++++++ steam-udev-rules-update.patch | 13 ------------- steam.spec | 38 ++++++++++++++++++++++---------------- 4 files changed, 77 insertions(+), 29 deletions(-) --- diff --git a/steam-makefile.patch b/steam-makefile.patch new file mode 100644 index 0000000..ccdcb44 --- /dev/null +++ b/steam-makefile.patch @@ -0,0 +1,22 @@ +diff -Naur steam-launcher.old/Makefile steam-launcher/Makefile +--- steam-launcher.old/Makefile 2020-04-15 11:51:24.213660509 +0200 ++++ steam-launcher/Makefile 2020-04-15 12:04:04.698333624 +0200 +@@ -3,7 +3,7 @@ + all: + @echo 'Run steam with "./steam" or install it with "sudo make install"' + +-install: install-bin install-docs install-icons install-bootstrap install-desktop install-apt-source ++install: install-bin install-docs install-icons install-bootstrap install-desktop + + install-bin: + install -d -m 755 $(DESTDIR)$(PREFIX)/bin/ +@@ -41,8 +41,7 @@ + install-desktop: + install -d -m 755 $(DESTDIR)$(PREFIX)/share/applications/ + install -d -m 755 $(DESTDIR)$(pkglibdir)/ +- install -p -m 644 $(PACKAGE).desktop $(DESTDIR)$(pkglibdir) +- ln -fns $(pkglibdir)/$(PACKAGE).desktop $(DESTDIR)$(datadir)/applications/ ++ install -p -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/ + + install-apt-source: + if [ -d /etc/apt ]; then \ diff --git a/steam-no-icon-on-desktop.patch b/steam-no-icon-on-desktop.patch new file mode 100644 index 0000000..cc99249 --- /dev/null +++ b/steam-no-icon-on-desktop.patch @@ -0,0 +1,33 @@ +diff -Naur steam-launcher.old/bin_steam.sh steam-launcher/bin_steam.sh +--- steam-launcher.old/bin_steam.sh 2020-04-15 11:51:24.202660348 +0200 ++++ steam-launcher/bin_steam.sh 2020-04-15 20:20:00.581536078 +0200 +@@ -110,29 +110,6 @@ + ln -fns "$STEAMDIR" "$STEAMDATALINK" + setup_variables + +- # put the Steam icon on the user's desktop +- # try to read ~/.config/user-dirs.dirs to get the current desktop configuration +- # http://www.freedesktop.org/wiki/Software/xdg-user-dirs +- # shellcheck source=/dev/null +- test -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" && source "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" +- DESKTOP_DIR="${XDG_DESKTOP_DIR:-$HOME/Desktop}" +- +- if [ -d "$DESKTOP_DIR" ] && [ "x$bootstrapdir" = "x/usr/lib/$STEAMPACKAGE" ]; then +- cp "$bootstrapdir/$STEAMPACKAGE.desktop" "$DESKTOP_DIR" +- # Older .desktop implementations used the execute bits as +- # a marker for a .desktop being safe to treat as a shortcut +- chmod a+x "$DESKTOP_DIR/$STEAMPACKAGE.desktop" +- if command -v gio >/dev/null; then +- # Making it executable is not enough in recent +- # (Ubuntu 20.04) versions of +- # https://gitlab.gnome.org/World/ShellExtensions/desktop-icons +- gio set --type=string "$DESKTOP_DIR/$STEAMPACKAGE.desktop" metadata::trusted true || : +- # Generate an inotify event so the desktop +- # implementation reloads it +- touch "$DESKTOP_DIR/$STEAMPACKAGE.desktop" +- fi +- fi +- + # Restore the umask + umask "$omask" + } diff --git a/steam.spec b/steam.spec index aef6d48..7cd7576 100644 --- a/steam.spec +++ b/steam.spec @@ -2,11 +2,11 @@ %global debug_package %{nil} Name: steam -Version: 1.0.0.61 -Release: 9%{?dist} +Version: 1.0.0.62 +Release: 1%{?dist} Summary: Installer for the Steam software distribution service -# Redistribution and repackaging for Linux is allowed, see license file -License: Steam License Agreement +# Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT. +License: Steam License Agreement and MIT URL: http://www.steampowered.com/ ExclusiveArch: i686 @@ -27,9 +27,14 @@ Source6: https://raw.githubusercontent.com/denilsonsa/udev-joystick-black # Configure limits in systemd < 240 Source7: 01-steam.conf -# Updated UDEV rules -# https://github.com/ValveSoftware/steam-devices/commit/00aa8483cd243cbea9c... -Patch0: %{name}-udev-rules-update.patch +# Newer UDEV rules +Source10: https://raw.githubusercontent.com/ValveSoftware/steam-devices/master/60-s... +Source11: https://raw.githubusercontent.com/ValveSoftware/steam-devices/master/60-s... + +# Do not install desktop file in lib/steam, do not install apt sources +Patch0: %{name}-makefile.patch +# Do not try to copy steam.desktop to the user's desktop from lib/steam +Patch1: %{name}-no-icon-on-desktop.patch BuildRequires: desktop-file-utils BuildRequires: systemd @@ -120,10 +125,7 @@ installation, automatic updates, achievements, SteamCloud synchronized savegame and screenshot functionality, and many social features. %prep -%autosetup -p1 -n %{name} - -sed -i 's/\r$//' %{name}.desktop -sed -i 's/\r$//' steam_subscriber_agreement.txt +%autosetup -p1 -n %{name}-launcher cp %{SOURCE5} . @@ -137,10 +139,8 @@ rm -fr %{buildroot}%{_docdir}/%{name}/ \ %{buildroot}%{_bindir}/%{name}deps mkdir -p %{buildroot}%{_udevrulesdir}/ -install -m 644 -p lib/udev/rules.d/* \ - %{SOURCE6} %{buildroot}%{_udevrulesdir}/ - -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +install -m 644 -p %{SOURCE10} %{SOURCE11} %{SOURCE6} \ + %{buildroot}%{_udevrulesdir}/ # Environment files mkdir -p %{buildroot}%{_sysconfdir}/profile.d @@ -158,6 +158,9 @@ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/ %endif +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + %post %if 0%{?rhel} == 7 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -178,7 +181,7 @@ fi %files %license COPYING steam_subscriber_agreement.txt -%doc README debian/changelog README.Fedora +%doc debian/changelog README.Fedora %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png @@ -199,6 +202,9 @@ fi %endif %changelog +* Wed Apr 15 2020 Simone Caronni <negativo17(a)gmail.com&gt; - 1.0.0.62-1 +- Update to 1.0.0.62. + * Sun Feb 09 2020 Simone Caronni <negativo17(a)gmail.com&gt; - 1.0.0.61-9 - Update README.Fedora - Require gamemode on Fedora & CentOS/RHEL 8.