[X2Go-Commits] [x2gokdrive] 03/03: x2gokdrive.spec: *SuSE puts the xorg-server source code into /usr/src/xserver.

git-admin at x2go.org git-admin at x2go.org
Mon Oct 28 23:19:53 CET 2019


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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit eb8ba9765ba6e63d12cb74e4fed974c88111e979
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 23:19:25 2019 +0100

    x2gokdrive.spec: *SuSE puts the xorg-server source code into /usr/src/xserver.
---
 debian/changelog | 1 +
 x2gokdrive.spec  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 344f6a9..d172142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       closely.
     + Use archive mode when copying xorg-server source. We probably want to
       keep stuff like timestamps to not break the Makefile dependencies.
+    + *SuSE puts the xorg-server source code into /usr/src/xserver.
   * debian/rules:
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 68381e3..e2edd97 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -224,7 +224,11 @@ More information about X2Go can be found at:
 
 # prepare xorg-server build tree
 mkdir -p 'BUILD'
+%if 0%{?suse_version}
+cp -av '/usr/share/xserver/'* 'BUILD/'
+%else
 cp -av '/usr/share/xorg-x11-server-source/'* 'BUILD/'
+%endif
 # Precaution from:
 # https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec
 find 'BUILD/' -type 'f' -perm '-001' -print0 | while read -r -d '' file; do

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


More information about the x2go-commits mailing list