[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: add BR: and R: on distribution-release (pseudo-package/provides) for /usr/lib/os-release and /etc/os-release.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 23404d1bf68068b962e06556a187ff2d543c87a8
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Mar 1 22:22:08 2023 +0100

    x2goserver.spec: add BR: and R: on distribution-release (pseudo-package/provides) for /usr/lib/os-release and /etc/os-release.
---
 debian/changelog |  2 ++
 x2goserver.spec  | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1c2a50ef..dcdffb64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -433,6 +433,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - x2goserver-xsession/Makefile: on systems that do not provide a global
       /etc/X11/Xresources file, create a dangling symlink instead. Unbreaks
       Debian builds.
+    - x2goserver.spec: add BR: and R: on distribution-release
+      (pseudo-package/provides) for /usr/lib/os-release and /etc/os-release.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
     + Pull in base64 as a run-time dependency. We'll need it in scripts.
diff --git a/x2goserver.spec b/x2goserver.spec
index 09374814..e829d988 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -81,6 +81,11 @@ BuildRequires: xinit
 BuildRequires:  xorg-x11-xinit
 %endif
 
+# For /usr/lib/os-release or /etc/os-release.
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+BuildRequires:  distribution-release
+%endif
+
 # Packages only needed for file system paths.
 BuildRequires:  sudo
 %if 0%{?fedora} > 19 || 0%{?el5} || 0%{?el6} || 0%{?el7}
@@ -524,6 +529,11 @@ Requires:       xinit
 Requires:       xorg-x11-xinit
 %endif
 
+# For /usr/lib/os-release or /etc/os-release.
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+Requires:       distribution-release
+%endif
+
 # dbus-run-session is tricky, so using a separate section for it.
 # For *SuSE:
 #   It's only available on SLE 12+ and OpenSuSE 13+.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git