[X2Go-Commits] [x2gokdrive] 04/08: x2gokdrive.spec: fix %autosetup usage - only use it when supported.

git-admin at x2go.org git-admin at x2go.org
Mon Oct 28 06:47:20 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 2c3bf4651d104b42be552d4b5f44fb251ac59235
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 05:13:46 2019 +0100

    x2gokdrive.spec: fix %autosetup usage - only use it when supported.
    
    RPM 4.11.x+.
---
 debian/changelog | 1 +
 x2gokdrive.spec  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 12668a5..705bebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       modified version of the binary package description.
     + Fix typo pkgconfig(Xau) => pkgconfig(xau).
     + Backport escaping layer change from debian/rules.
+    + Fix %autosetup usage - only use it when supported. RPM 4.11.x+.
   * debian/rules:
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 85f5130..3c2b5e0 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -186,7 +186,11 @@ More information about X2Go can be found at:
 
 %prep
 # %%autosetup creates BUILD subdir
+%if 0%{?fedora} >= 19 || 0%{?suse_version} >= 1310 || 0%{?sle_version} >= 120400 || 0%{?rhel} >= 7
 %autosetup
+%else
+%setup
+%endif
 
 # prepare xorg-server build tree
 cp -r '/usr/share/xorg-x11-server-source/'* 'BUILD/'

--
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