[X2Go-Commits] [x2gokdrive] 01/02: x2gokdrive.spec: X11 server package is not split up into binary and common packages on *SuSE, so change dependency to xorg-x11-server.

[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 x2gokdrive.

commit 011c4131b43e7d4cb32eade27ec09298ea60d49a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 3 18:58:46 2023 +0100

    x2gokdrive.spec: X11 server package is not split up into binary and common packages on *SuSE, so change dependency to xorg-x11-server.
---
 debian/changelog | 2 ++
 x2gokdrive.spec  | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f925782..333ba0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       rebased patch set.
     - patches.xorg/21.1.4/xorg-server-configure-ac.patch: fix FTBFS, typo when
       applying patch.
+    - x2gokdrive.spec: X11 server package is not split up into binary and
+      common packages on *SuSE, so change dependency to xorg-x11-server.
   * debian/control:
     + Grammar fix.
     + Remove dependencies that refer to disabled features.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 8ca2ded..892c668 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -204,7 +204,11 @@ More information about X2Go can be found at:
 
 %package -n xorg-x11-server-x2gokdrive
 Summary:        KDrive graphical server backend for X2GoServer
+%if 0%{?suse_version}
+Requires:       xorg-x11-server >= 1.18.4
+%else
 Requires:       xorg-x11-server-common >= 1.18.4
+%endif
 %if 0%{?rhel} > 8 || 0%{?suse_version}
 Recommends:     mesa-dri-drivers
 Recommends:     x2goserver >= 4.1.0.4
@@ -399,7 +403,7 @@ popd
 %files -n xorg-x11-server-x2gokdrive
 %defattr(-,root,root)
 %{_bindir}/x2gokdrive
-# Exclude protocol.txt, it's shipped by xorg-x11-server-common and we don't
+# Exclude protocol.txt, it's shipped by xorg-x11-server(-common) and we don't
 # want to conflict with that package.
 %exclude %{_libexecdir}/protocol.txt
 %exclude %{_mandir}/man1/Xserver.1.gz

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