This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 6bd71ff1aa6c52f8fdf5d8f5ab390e03f07fe01c Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:36:01 2019 +0200 x2gokdrive.spec: backport changes from debian/rules. --- debian/changelog | 1 + x2gokdrive.spec | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 361c362..95f057a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Copy summary from Debian's short description. + Spell out each (build) dependency on one line. + Whitespace-only fixes. + + Backport changes from debian/rules. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 503a5ef..08d6b02 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -129,23 +129,31 @@ More information about X2Go can be found at: %autosetup # prepare xorg-server build tree -cp -r /usr/share/xorg-x11-server-source/* BUILD +cp -r '/usr/share/xorg-x11-server-source/'* 'BUILD/' # Precaution from: # https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec -for all in `find BUILD/ -type f -perm -001`; do - chmod -x "$all" +find 'BUILD/' -type 'f' -perm '-001' -print0 | while read -r -d '' file; do + chmod -x "${file}" done -mkdir BUILD/hw/kdrive/x2gokdrive/ -p +mkdir -p 'BUILD/hw/kdrive/x2gokdrive/' # inject x2gokdrive into xorg-server build tree -cp Makefile.am *.c *.h BUILD/hw/kdrive/x2gokdrive/ -cp -r man/ BUILD/hw/kdrive/x2gokdrive/ +cp 'Makefile.am' *'.c' *'.h' 'BUILD/hw/kdrive/x2gokdrive/' +cp -r 'man/' 'BUILD/hw/kdrive/x2gokdrive/' # patch xorg-server build tree, so that it will build x2gokdrive -set -x; export XORG_UPSTREAM_VERSION=`cat BUILD/configure.ac | grep AC_INIT | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \ - && cd BUILD \ - && test -d ../patches.xorg/$XORG_UPSTREAM_VERSION && QUILT_PATCHES=../patches.xorg/$XORG_UPSTREAM_VERSION/ quilt push -a \ - || ( set +x; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1); +set -x +export XORG_UPSTREAM_VERSION="$(grep 'AC_INIT' 'BUILD/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/')" +cd 'BUILD' +if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}" ]; then + QUILT_PATCHES="../patches.xorg/${XORG_UPSTREAM_VERSION}/" quilt push -a +else + ( + set +x + printf '\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version %s.\n##################################################\n' "${XORG_UPSTREAM_VERSION}" + exit '1' + ) +fi %build %ifarch sparcv9 sparc64 s390 s390x @@ -155,8 +163,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic" %endif export CXXFLAGS="$CFLAGS" -pushd BUILD -autoreconf -fiv +pushd 'BUILD' +autoreconf -fvi # Another block from tigervnc.spec, except for the 1st option line. %configure \ --enable-kdrive --enable-x2gokdrive \ @@ -179,8 +187,8 @@ make %{?_smp_mflags} popd %install -pushd BUILD -make install DESTDIR=%{buildroot} +pushd 'BUILD' +make install DESTDIR='%{buildroot}' popd %files -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git