[X2Go-Commits] [x2gokdrive] 05/08: x2gokdrive.spec: %autosetup (or %setup) create a top-level BUILD directory into which the source tarball is extracted - but we also need a BUILD sub-directory.

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 a62532aad3c8bf6999a645386b5a3e7179698734
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 05:16:48 2019 +0100

    x2gokdrive.spec: %autosetup (or %setup) create a top-level BUILD directory into which the source tarball is extracted - but we also need a BUILD sub-directory.
    
    Create it.
---
 debian/changelog | 3 +++
 x2gokdrive.spec  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 705bebd..29f5a6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     + 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+.
+    + %autosetup (or %setup) create a top-level BUILD directory into which the
+      source tarball is extracted - but we also need a BUILD sub-directory.
+      Create it.
   * debian/rules:
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 3c2b5e0..1ed9666 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -185,7 +185,6 @@ 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
@@ -193,6 +192,7 @@ More information about X2Go can be found at:
 %endif
 
 # prepare xorg-server build tree
+mkdir -p 'BUILD'
 cp -r '/usr/share/xorg-x11-server-source/'* 'BUILD/'
 # Precaution from:
 # https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec

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