Hello community,

here is the log from the commit of package steam for openSUSE:Factory:NonFree 
checked in at 2020-08-17 11:57:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory:NonFree/steam (Old)
 and      /work/SRC/openSUSE:Factory:NonFree/.steam.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "steam"

Mon Aug 17 11:57:41 2020 rev:27 rq:826875 version:1.0.0.66

Changes:
--------
--- /work/SRC/openSUSE:Factory:NonFree/steam/steam.changes      2020-08-10 
14:50:34.387765287 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.steam.new.3399/steam.changes    
2020-08-17 11:57:42.186437560 +0200
@@ -1,0 +2,10 @@
+Sat Aug 15 18:23:08 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com>
+
+- Update AppStream files
+- Add patches from RPMFusion:
+  * steam-makefile.patch: remove pointless symlinks
+    and apt-source install
+  * steam-no-icon-on-desktop.patch: remove attempt
+    to copy .desktop to user desktop
+
+-------------------------------------------------------------------

Old:
----
  steam.appdata.xml

New:
----
  com.steampowered.steam.metainfo.xml
  steam-makefile.patch
  steam-no-icon-on-desktop.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ steam.spec ++++++
--- /var/tmp/diff_new_pack.NbJyoW/_old  2020-08-17 11:57:42.986438006 +0200
+++ /var/tmp/diff_new_pack.NbJyoW/_new  2020-08-17 11:57:42.986438006 +0200
@@ -25,12 +25,16 @@
 Group:          Amusements/Games/Other
 URL:            http://www.steampowered.com/
 Source:         
http://repo.steampowered.com/steam/pool/steam/s/steam/steam_%{version}.tar.gz
-Source2:        steam.appdata.xml
+Source2:        com.steampowered.steam.metainfo.xml
 Source3:        %{name}-streaming.xml 
 # Based on 
https://raw.githubusercontent.com/steamtricks/steamtricks/master/dist/patch/steam-invoke_steamtricks.patch
 Patch0:         steam-invoke_steamtricks.patch
 # PATCH-FIX-OPENSUSE steam-path-fix.patch bnc#1025841
 Patch1:         steam-path-fix.patch
+# PATCH-FIX-OPENSUSE steam-makefile.patch based on RPMFusion patch.
+Patch2:         steam-makefile.patch
+# PATCH-FIX-OPENSUSE steam-no-icon-on-desktop.patch from RPMFusion
+Patch3:         steam-no-icon-on-desktop.patch
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  update-desktop-files
@@ -154,7 +158,7 @@
 %build
 
 %install
-make DESTDIR=%{buildroot} install-bin install-docs install-icons 
install-bootstrap install-desktop
+%make_install
 
 # TODO: Patch it so it works with zypper or at least does not invoke apt-get.
 rm %{buildroot}%{_bindir}/steamdeps
@@ -165,7 +169,7 @@
 cp subprojects/steam-devices/60-steam-vr.rules 
%{buildroot}%{_udevrulesdir}/60-steam-vr.rules
 
 # https://en.opensuse.org/openSUSE:AppStore
-install -Dm0644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+install -Dm0644 %{SOURCE2} 
%{buildroot}%{_datadir}/metainfo/com.steampowered.steam.metainfo.xml
 
 install -Dm644 %{SOURCE3} 
%{buildroot}%{_prefix}/lib/firewalld/services/steam-streaming.xml
 
@@ -201,13 +205,11 @@
 %doc %{_datadir}/doc/%{name}/README
 %doc debian/changelog
 %{_mandir}/man6/%{name}.6%{?ext_man}
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/%{name}.appdata.xml
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/com.steampowered.steam.metainfo.xml
 %dir %{_prefix}/lib/firewalld
 %dir %{_prefix}/lib/firewalld/services
 %{_prefix}/lib/firewalld/services/steam-streaming.xml
-%{_prefix}/lib/steam/bin_steam.sh
-%{_prefix}/lib/steam/steam.desktop
 
 %files devices
 %license subprojects/steam-devices/LICENSE

++++++ com.steampowered.steam.metainfo.xml ++++++
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
  <id>com.steampowered.steam</id>
  <launchable type="desktop-id">steam.desktop</launchable>
  <name>Steam</name>
  <summary>Installer for the Steam client</summary>
  <icon type="stock">steam</icon>
  <description>
    <p>
      Steam is a digital distribution platform developed by Valve Corporation 
offering digital rights management (DRM), multiplayer gaming and social 
networking services. Steam provides the user with installation and automatic 
updating of games on multiple computers, and community features such as friends 
lists and groups, cloud saving, and in-game voice and chat functionality.
    </p>
    <p>The software provides a freely available application programming 
interface (API) called Steamworks, which developers can use to integrate many 
of Steam's functions into their products, including networking, matchmaking, 
in-game achievements, micro-transactions, and support for user-created content 
through Steam Workshop.
    </p>
  </description>
  <translation/>
  <url type="homepage">https://store.steampowered.com/</url>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>Freeware</project_license>
  <developer_name>Valve Corporation</developer_name>
  <keywords>
    <keyword>Gaming</keyword>
    <keyword>Valve</keyword>
    <keyword>Streaming</keyword>
  </keywords>
  <screenshots>
    <screenshot type="default">
      <caption>Steam Store interface</caption>
      <image type="source" width="396" 
height="290">http://store.akamai.steamstatic.com/public/images/about/pc_image.png</image>
    </screenshot>
    <screenshot>
      <caption>Steam Big Picture mode</caption>
      <image type="source" width="1920" 
height="1080">http://store.akamai.steamstatic.com/public/images/bigpicture/Dwm%202012-09-05%2016-33-46-80.png</image>
    </screenshot>
  </screenshots>
</component>
++++++ steam-makefile.patch ++++++
https://github.com/rpmfusion/steam/blob/master/steam-makefile.patch

Slightly edited to remove bin_steam.sh link as well. 
--
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/
@@ -8,9 +8,8 @@
 install-bin:
        install -d -m 755 $(DESTDIR)$(PREFIX)/bin/
        install -d -m 755 $(DESTDIR)$(pkglibdir)/
-       install -p -m 755 bin_steam.sh $(DESTDIR)$(pkglibdir)/
+       install -p -m 755 bin_steam.sh $(DESTDIR)$(bindir)/$(PACKAGE)
        install -p -m 755 bin_steamdeps.py $(DESTDIR)$(pkglibdir)/
-       ln -fns $(pkglibdir)/bin_steam.sh $(DESTDIR)$(bindir)/$(PACKAGE)
        ln -fns $(pkglibdir)/bin_steamdeps.py $(DESTDIR)$(bindir)/$(PACKAGE)deps

 install-docs:
@@ -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 \
++++++ steam-no-icon-on-desktop.patch ++++++
https://github.com/rpmfusion/steam/blob/master/steam-no-icon-on-desktop.patch
--
diff -Naur steam-launcher.old/bin_steam.sh steam-launcher/bin_steam.sh
--- steam-launcher.old/bin_steam.sh     2020-06-29 07:37:51.655884908 +0200
+++ steam-launcher/bin_steam.sh 2020-06-29 07:38:20.635411806 +0200
@@ -110,32 +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
-               # There might be a symlink in place already, in such case we do 
nothing
-               if [ ! -L "$DESKTOP_DIR/$STEAMPACKAGE.desktop" ]; 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
-       fi
-
        # Restore the umask
        umask "$omask"
 }

Reply via email to