This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from b30f5d2 Add draft RPM packaging x2gokdrive.spec new c218109 debian/control: grammar fix. new dbc9d48 x2gokdrive.spec: drop Debian-style formatting in description. new 33ad1a2 x2gokdrive.spec: typo fixes. new 95f60bc x2gokdrive.spec: remove empty line at EOF. new 725fbf5 x2gokdrive.spec: copy summary from Debian's short description. new aa2c550 x2gokdrive.spec: spell out each (build) dependency on one line. new 9401017 x2gokdrive: whitespace-only fixes. new 64444cb debian/rules: remove weird empty variable reference construct. new 111c26d debian/rules: whitespace-only fixes. new bec61b8 debian/rules: move options to the front of commands. new 04ae661 debian/rules: drop useless use of cat. new fc54666 debian/rules: avoid backticks, use $() instead. new a2d76f1 debian/rules: "a && b || c" doesn't really mean "if a then b else c", but something... more difficult: "c" does also run if "a" is false. new 124b043 debian/rules: split up subshell content onto unique lines and fix bash syntax error near "exit 1". new 08df5a9 debian/rules: use printf instead of echo. new 78ee077 debian/rules: avoid xargs, use find's -exec feature. new 6807c24 debian/rules: more and better quoting. new 6bd71ff x2gokdrive.spec: backport changes from debian/rules. new 586f67b debian/rules: verbosely remove *.la files. new 01b5c9b x2gokdrive.spec: copy *.la file removal mechanism from debian/rules. new 890218b x2gokdrive.spec: pull in lsb-release on *SuSE systems and redhat-lsb otherwise for lsb_release, needed at package configuration time. new d520444 debian/rules.flags: define NULL variable and use it throughout the file. new ced999e x2gokdrive.spec: enable hardening in a low-effort way. new 9bc2af1 x2gokdrive.spec: disable debugsource... disabling. new fc25562 x2gokdrive.spec: copy configure flags from debian/rules{,.flags}. new 774eb59 debian/control: remove dependencies that refer to disabled features. new d5880d2 x2gokdrive.spec: sync dependency lists with debian/control. new 5ac41c1 x2gokdrive.spec: rename binary package to xorg-x11-server-x2gokdrive to be consistent with Fedora/*SuSE package naming. The 28 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 46 ++++++++ debian/control | 5 +- debian/rules | 42 +++---- debian/rules.flags | 13 ++- x2gokdrive.spec | 325 ++++++++++++++++++++++++++++++++++++----------------- 5 files changed, 302 insertions(+), 129 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 94010172f67717d548d0c4001b022eaf61a8334a Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:52:20 2019 +0200 x2gokdrive: whitespace-only fixes. --- debian/changelog | 1 + x2gokdrive.spec | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 72b2013..6f25c50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,5 +15,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Remove empty line at EOF. + Copy summary from Debian's short description. + Spell out each (build) dependency on one line. + + Whitespace-only fixes. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 0b9e590..503a5ef 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -91,11 +91,11 @@ Requires: xkeyboard-config Requires: xorg-x11-xkb-utils %if 0%{?rhel} <= 7 -Requires: mesa-dri-drivers -Requires: x2goserver >= 4.2.0.0 +Requires: mesa-dri-drivers +Requires: x2goserver >= 4.2.0.0 %else -Recommends: mesa-dri-drivers -Recommends: x2goserver >= 4.2.0.0 +Recommends: mesa-dri-drivers +Recommends: x2goserver >= 4.2.0.0 %endif %description @@ -175,7 +175,7 @@ autoreconf -fiv --without-dtrace \ --disable-devel-docs \ --disable-selective-werror -make %{?_smp_mflags} +make %{?_smp_mflags} popd %install -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 95f60bcbd33761234820f2bf9fbba1b0c0b1f1ce Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:49:40 2019 +0200 x2gokdrive.spec: remove empty line at EOF. --- debian/changelog | 1 + x2gokdrive.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a15066d..f2a3515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,5 +12,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium * x2gokdrive.spec: + Drop Debian-style formatting in description. + Typo fixes. + + Remove empty line at EOF. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/x2gokdrive.spec b/x2gokdrive.spec index b99dae5..7e2d20f 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -167,4 +167,3 @@ popd %doc %{_mandir}/man1/x2gokdrive.1.gz %changelog - -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit fc54666bf7d59dfd1e7d808389f0280c05f872e5 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 22:51:26 2019 +0200 debian/rules: avoid backticks, use $() instead. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f686442..4917e50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,5 +21,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Whitespace-only fixes. + Move options to the front of commands. + Drop useless use of cat. + + Avoid backticks, use $() instead. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index 4d0a590..d95c7ac 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_configure: cp -r $(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/ # patch xorg-server build tree, so that it will build x2gokdrive - set -x; export XORG_UPSTREAM_VERSION=`grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \ + set -x; export XORG_UPSTREAM_VERSION=$$(grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/') \ && cd $(CURDIR)/BUILD/xorg-server \ && 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) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 64444cb4c85a533dee6f6c92c799c811c8299c78 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 22:16:34 2019 +0200 debian/rules: remove weird empty variable reference construct. --- debian/changelog | 2 ++ debian/rules | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f25c50..ff60008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,5 +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. + * debian/rules: + + Remove weird empty variable reference construct. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index 7585472..b3e1e49 100755 --- a/debian/rules +++ b/debian/rules @@ -29,8 +29,7 @@ override_dh_auto_configure: set -x; export XORG_UPSTREAM_VERSION=`cat $(CURDIR)/BUILD/xorg-server/configure.ac | grep AC_INIT | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \ && cd $(CURDIR)/BUILD/xorg-server \ && 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; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1) # run autoreconf cd $(CURDIR)/BUILD/xorg-server && autoreconf -vfi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 04ae661613335b66fdce791ec74927536f3a4d3d Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 22:47:23 2019 +0200 debian/rules: drop useless use of cat. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cf6e23b..f686442 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,5 +20,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Remove weird empty variable reference construct. + Whitespace-only fixes. + Move options to the front of commands. + + Drop useless use of cat. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index 15b4174..4d0a590 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_configure: cp -r $(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/ # patch xorg-server build tree, so that it will build x2gokdrive - set -x; export XORG_UPSTREAM_VERSION=`cat $(CURDIR)/BUILD/xorg-server/configure.ac | grep AC_INIT | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \ + set -x; export XORG_UPSTREAM_VERSION=`grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \ && cd $(CURDIR)/BUILD/xorg-server \ && 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) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 33ad1a21dd679e0a3a696f528687f7261aa019e7 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:48:50 2019 +0200 x2gokdrive.spec: typo fixes. --- debian/changelog | 1 + x2gokdrive.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53b4905..a15066d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,5 +11,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Grammar fix. * x2gokdrive.spec: + Drop Debian-style formatting in description. + + Typo fixes. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/x2gokdrive.spec b/x2gokdrive.spec index d98c2ff..b99dae5 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -1,5 +1,5 @@ # %%exclude %%{_prefix}lib/debug/usr/bin/x2gokdrive* -# gets created, but we cannot exlude it under %%files +# gets created, but we cannot exclude it under %%files # without rpmlint throwing an error. %define _debugsource_packages 0 @@ -58,7 +58,7 @@ BuildRequires: xorg-x11-server-devel # Copied and pasted "server" subpackage block from: # https://github.com/TigerVNC/tigervnc/blob/master/contrib/packages/rpm/el7/SP... -# (With TigerVNC speciifc stuff removed, such as Perl for their launch scripts.) +# (With TigerVNC specific stuff removed, such as Perl for their launch scripts.) Requires: xorg-x11-xauth Requires: xorg-x11-xinit -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit bec61b8e860994604f319e8f9281556f659e3d3c Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 22:35:10 2019 +0200 debian/rules: move options to the front of commands. --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7c959f..cf6e23b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,5 +19,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. + + Move options to the front of commands. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index bc05138..15b4174 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,9 @@ include debian/rules.flags override_dh_auto_configure: # prepare xorg-server build tree - mkdir $(CURDIR)/BUILD -p + mkdir -p $(CURDIR)/BUILD cd $(CURDIR)/BUILD && tar -xvf /usr/src/xorg-server.tar.xz - mkdir $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/ -p + mkdir -p $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/ # inject x2gokdrive into xorg-server build tree cp Makefile.am *.c *.h $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit dbc9d485785cf653a3a470e33a12bbb667ebe6b2 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:47:37 2019 +0200 x2gokdrive.spec: drop Debian-style formatting in description. --- debian/changelog | 2 ++ x2gokdrive.spec | 47 +++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19641f1..53b4905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,5 +9,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * debian/control: + Grammar fix. + * x2gokdrive.spec: + + Drop Debian-style formatting in description. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/x2gokdrive.spec b/x2gokdrive.spec index f9a50dc..d98c2ff 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -74,30 +74,29 @@ Recommends: x2goserver >= 4.2.0.0 %endif %description -KDrive graphical server backend for X2Go Server - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session brokerage support - - client-side mass storage mounting support - - client-side printing support - - audio support - - authentication by smartcard and USB stick - . - This package is built from the X.org xserver module. X2Go KDrive is a - KDrive based Xserver for X2Go. It provides support for running modern - desktop environments like GNOME, KDE Plasma, Cinnamon, etc. in X2Go - Sessions. - . - The X2Go KDrive graphical backend is not suitable for low bandwidth WAN - connections between X2Go Client and X2Go Server. It is supposed for X2Go - being used on the local area network. - . - More information about X.Org can be found at: - <URL:https://www.x.org> - . - More information about X2Go can be found at: - <URL:https://wiki.x2go.org> +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + +This package is built from the X.org xserver module. X2Go KDrive is a +KDrive-based Xserver for X2Go. It provides support for running modern +desktop environments like GNOME, KDE Plasma, Cinnamon, etc. in X2Go +Sessions. + +The X2Go KDrive graphical backend is not suitable for low bandwidth WAN +connections between X2Go Client and X2Go Server. It is supposed for X2Go +being used on the local area network. + +More information about X.Org can be found at: +<URL:https://www.x.org> + +More information about X2Go can be found at: +<URL:https://wiki.x2go.org> %prep -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit aa2c5506c3acc69a7e00a3aa520c45b4b21a2274 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:51:52 2019 +0200 x2gokdrive.spec: spell out each (build) dependency on one line. --- debian/changelog | 1 + x2gokdrive.spec | 51 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22763a3..72b2013 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,5 +14,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Typo fixes. + Remove empty line at EOF. + Copy summary from Debian's short description. + + Spell out each (build) dependency on one line. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/x2gokdrive.spec b/x2gokdrive.spec index d2faabd..0b9e590 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -29,8 +29,11 @@ BuildRequires: quilt # Copied and pasted block from: # https://src.fedoraproject.org/rpms/xorg-x11-server/blob/master/f/xorg-x11-se... -BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm) -BuildRequires: pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) +BuildRequires: pkgconfig(xcb-aux) +BuildRequires: pkgconfig(xcb-image) +BuildRequires: pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xcb-renderutil) # Copied and pasted block from: # https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec # Copied because almost all of them are required for xorg-x11-server-source @@ -39,16 +42,37 @@ BuildRequires: pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) # to use as a reference, just el6 and el7 specific .spec files. # https://github.com/TigerVNC/tigervnc/tree/master/contrib/packages/rpm BuildRequires: gcc-c++ -BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint -BuildRequires: libXext-devel, xorg-x11-server-source, libXi-devel -BuildRequires: xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel -BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel -BuildRequires: mesa-libGL-devel, libXinerama-devel, -BuildRequires: freetype-devel, libXdmcp-devel, libxshmfence-devel -BuildRequires: desktop-file-utils, java-devel, jpackage-utils -BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel -BuildRequires: libdrm-devel, libXt-devel, pixman-devel -BuildRequires: systemd, cmake +BuildRequires: libX11-devel +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: gettext +BuildRequires: gettext-autopoint +BuildRequires: libXext-devel +BuildRequires: xorg-x11-server-source +BuildRequires: libXi-devel +BuildRequires: xorg-x11-xtrans-devel +BuildRequires: xorg-x11-util-macros +BuildRequires: libXtst-devel +BuildRequires: libxkbfile-devel +BuildRequires: openssl-devel +BuildRequires: libpciaccess-devel +BuildRequires: mesa-libGL-devel +BuildRequires: libXinerama-devel +BuildRequires: freetype-devel +BuildRequires: libXdmcp-devel +BuildRequires: libxshmfence-devel +BuildRequires: desktop-file-utils +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: libjpeg-turbo-devel +BuildRequires: gnutls-devel +BuildRequires: pam-devel +BuildRequires: libdrm-devel +BuildRequires: libXt-devel +BuildRequires: pixman-devel +BuildRequires: systemd +BuildRequires: cmake %if 0%{?fedora} > 24 || 0%{?rhel} >= 7 BuildRequires: libXfont2-devel %else @@ -63,7 +87,8 @@ Requires: xorg-x11-xauth Requires: xorg-x11-xinit # Copied and pasted "server-minimal" subpackage block from above -Requires: xkeyboard-config, xorg-x11-xkb-utils +Requires: xkeyboard-config +Requires: xorg-x11-xkb-utils %if 0%{?rhel} <= 7 Requires: mesa-dri-drivers -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit c218109b4b41f40e3ac1e0c521a669e370402818 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:46:14 2019 +0200 debian/control: grammar fix. --- debian/changelog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index be4001a..19641f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,4 +6,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium [ Oleksandr Shneyder ] * Calculate screen dimensions (in mm) according to dpi value. Default DPI (Xorg) is 75. User can set DPI using -dpi command line option. + [ Mihai Moldovan ] + * debian/control: + + Grammar fix. + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/control b/debian/control index ea4daec..609af23 100644 --- a/debian/control +++ b/debian/control @@ -114,7 +114,7 @@ Description: KDrive graphical server backend for X2Go Server - authentication by smartcard and USB stick . This package is built from the X.org xserver module. X2Go KDrive is a - KDrive based Xserver for X2Go. It provides support for running modern + KDrive-based Xserver for X2Go. It provides support for running modern desktop environments like GNOME, KDE Plasma, Cinnamon, etc. in X2Go Sessions. . -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 111c26d21803bd60fa7c0f01942c0298424a2482 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 22:19:30 2019 +0200 debian/rules: whitespace-only fixes. --- debian/changelog | 1 + debian/rules | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff60008..a7c959f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,5 +18,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Whitespace-only fixes. * debian/rules: + Remove weird empty variable reference construct. + + Whitespace-only fixes. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index b3e1e49..bc05138 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ include debian/rules.flags dh $@ --with quilt --parallel override_dh_auto_configure: - # prepare xorg-server build tree mkdir $(CURDIR)/BUILD -p cd $(CURDIR)/BUILD && tar -xvf /usr/src/xorg-server.tar.xz @@ -47,8 +46,7 @@ override_dh_auto_test: # disabled, nothing to test for x2gokdrive... override_dh_auto_install: - dh_auto_install --builddirectory=BUILD/xorg-server/ \ - --destdir=debian/tmp/ + dh_auto_install --builddirectory=BUILD/xorg-server/ --destdir=debian/tmp/ # oh, yuck. find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit a2d76f169b8eb8647e86b93d84aa49564dd7829f Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:03:48 2019 +0200 debian/rules: "a && b || c" doesn't really mean "if a then b else c", but something... more difficult: "c" does also run if "a" is false. Switch to a proper if-else construct. --- debian/changelog | 3 +++ debian/rules | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4917e50..5d19d29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,5 +22,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Move options to the front of commands. + Drop useless use of cat. + Avoid backticks, use $() instead. + + "a && b || c" doesn't really mean "if a then b else c", but something... + more difficult: "c" does also run if "a" is false. Switch to a proper + if-else construct. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index d95c7ac..6624cbe 100755 --- a/debian/rules +++ b/debian/rules @@ -27,8 +27,11 @@ override_dh_auto_configure: # patch xorg-server build tree, so that it will build x2gokdrive set -x; export XORG_UPSTREAM_VERSION=$$(grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/') \ && cd $(CURDIR)/BUILD/xorg-server \ - && 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) + if [ -d ../../patches.xorg/$$XORG_UPSTREAM_VERSION ]; then \ + QUILT_PATCHES=../../patches.xorg/$${XORG_UPSTREAM_VERSION}/ quilt push -a; \ + else \ + ( set +x; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1); \ + fi # run autoreconf cd $(CURDIR)/BUILD/xorg-server && autoreconf -vfi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 124b043d8ddd8792cb083058ecc0bd8a420acaf1 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:08:11 2019 +0200 debian/rules: split up subshell content onto unique lines and fix bash syntax error near "exit 1". --- debian/changelog | 2 ++ debian/rules | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5d19d29..1b10c70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,5 +25,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + "a && b || c" doesn't really mean "if a then b else c", but something... more difficult: "c" does also run if "a" is false. Switch to a proper if-else construct. + + Split up subshell content onto unique lines and fix bash syntax error + near "exit 1". -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index 6624cbe..bd953da 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,11 @@ override_dh_auto_configure: if [ -d ../../patches.xorg/$$XORG_UPSTREAM_VERSION ]; then \ QUILT_PATCHES=../../patches.xorg/$${XORG_UPSTREAM_VERSION}/ quilt push -a; \ else \ - ( 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; \ + echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; \ + exit 1; \ + ); \ fi # run autoreconf -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 725fbf5c9ce05bf703317393e3045eaf4aef893a Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 21:50:24 2019 +0200 x2gokdrive.spec: copy summary from Debian's short description. --- debian/changelog | 1 + x2gokdrive.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f2a3515..22763a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,5 +13,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Drop Debian-style formatting in description. + Typo fixes. + Remove empty line at EOF. + + Copy summary from Debian's short description. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 7e2d20f..d2faabd 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -6,7 +6,7 @@ Name: x2gokdrive Version: 0.0.0.1 Release: 0.0x2go1%{?dist} -Summary: X2GoKDrive - KDrive X-Server for X2Go +Summary: KDrive graphical server backend for X2GoServer %if 0%{?fedora} || 0%{?rhel} Group: Applications/Communications -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 586f67b8aca5d49573e37fde760f8456252a8dba Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:37:59 2019 +0200 debian/rules: verbosely remove *.la files. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95f057a..d4d8be9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,5 +33,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium non-portable. + Avoid xargs, use find's -exec feature. + More and better quoting. + + Verbosely remove *.la files. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index dbd988e..90237f2 100755 --- a/debian/rules +++ b/debian/rules @@ -57,7 +57,7 @@ override_dh_auto_install: dh_auto_install --builddirectory='BUILD/xorg-server/' --destdir='debian/tmp/' # oh, yuck. - find '$(CURDIR)/debian/tmp/usr/lib/xorg' -type 'f' -name '*.la' -exec rm -f '{}' ';' + find '$(CURDIR)/debian/tmp/usr/lib/xorg' -type 'f' -name '*.la' -exec rm -fv '{}' ';' override_dh_auto_clean: -dh_auto_clean -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 9bc2af18fb6044f033cb181d6879dc1d47909f8e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Oct 25 00:35:43 2019 +0200 x2gokdrive.spec: disable debugsource... disabling. Debug packages are actually useful! --- debian/changelog | 1 + x2gokdrive.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47f027c..b300328 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Pull in lsb-release on *SuSE systems and redhat-lsb otherwise for lsb_release, needed at package configuration time. + Enable hardening in a low-effort way. + + Disable debugsource... disabling. Debug packages are actually useful! * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 5ae4412..524590f 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -1,7 +1,7 @@ # %%exclude %%{_prefix}lib/debug/usr/bin/x2gokdrive* # gets created, but we cannot exclude it under %%files # without rpmlint throwing an error. -%define _debugsource_packages 0 +#%%define _debugsource_packages 0 %global _hardened_build 1 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit ced999e7a6f036c44585b5c7d06413dd155b3251 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Oct 25 00:33:49 2019 +0200 x2gokdrive.spec: enable hardening in a low-effort way. --- debian/changelog | 1 + x2gokdrive.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index b1cabce..47f027c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Copy *.la file removal mechanism from debian/rules. + Pull in lsb-release on *SuSE systems and redhat-lsb otherwise for lsb_release, needed at package configuration time. + + Enable hardening in a low-effort way. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index ca1e8f8..5ae4412 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -3,6 +3,8 @@ # without rpmlint throwing an error. %define _debugsource_packages 0 +%global _hardened_build 1 + Name: x2gokdrive Version: 0.0.0.1 Release: 0.0x2go1%{?dist} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 890218b1728b32c4709693ee739cc8a8972a77ce Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:57:53 2019 +0200 x2gokdrive.spec: pull in lsb-release on *SuSE systems and redhat-lsb otherwise for lsb_release, needed at package configuration time. --- debian/changelog | 2 ++ x2gokdrive.spec | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5e89ac8..076c9fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Whitespace-only fixes. + Backport changes from debian/rules. + Copy *.la file removal mechanism from debian/rules. + + Pull in lsb-release on *SuSE systems and redhat-lsb otherwise for + lsb_release, needed at package configuration time. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 7531853..ca1e8f8 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -22,6 +22,11 @@ Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version} # Required specifically for x2gokdrive BuildRequires: libpng-devel +%if 0%{?suse_version} +BuildRequires: lsb-release +%else +BuildRequires: redhat-lsb +%endif # x2gokdrive provides patch dirs for xorg-x11-server-source in quilt format BuildRequires: quilt -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 6807c24394446b2ed07facf95092b95481fff3ed Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:27:41 2019 +0200 debian/rules: more and better quoting. --- debian/changelog | 1 + debian/rules | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74a1c42..361c362 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,5 +31,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium sequences for their plain char counterparts and the -e switch is non-portable. + Avoid xargs, use find's -exec feature. + + More and better quoting. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index 48c9e08..dbd988e 100755 --- a/debian/rules +++ b/debian/rules @@ -16,51 +16,52 @@ include debian/rules.flags override_dh_auto_configure: # prepare xorg-server build tree - mkdir -p $(CURDIR)/BUILD - cd $(CURDIR)/BUILD && tar -xvf /usr/src/xorg-server.tar.xz - mkdir -p $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/ + mkdir -p '$(CURDIR)/BUILD' + cd '$(CURDIR)/BUILD' && tar -xvf '/usr/src/xorg-server.tar.xz' + mkdir -p '$(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/' # inject x2gokdrive into xorg-server build tree - cp Makefile.am *.c *.h $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/ - cp -r $(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/ + cp 'Makefile.am' *'.c' *'.h' '$(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/' + cp -r '$(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/' # patch xorg-server build tree, so that it will build x2gokdrive - set -x; export XORG_UPSTREAM_VERSION=$$(grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/') \ - && cd $(CURDIR)/BUILD/xorg-server \ - if [ -d ../../patches.xorg/$$XORG_UPSTREAM_VERSION ]; then \ - QUILT_PATCHES=../../patches.xorg/$${XORG_UPSTREAM_VERSION}/ quilt push -a; \ + set -x; \ + export XORG_UPSTREAM_VERSION="$$(grep AC_INIT '$(CURDIR)/BUILD/xorg-server/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/')" && \ + cd '$(CURDIR)/BUILD/xorg-server' && \ + 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; \ + exit '1'; \ ); \ fi # run autoreconf - cd $(CURDIR)/BUILD/xorg-server && autoreconf -vfi + cd '$(CURDIR)/BUILD/xorg-server' && autoreconf -fvi # run configure - dh_auto_configure --builddirectory=BUILD/xorg-server/ --sourcedirectory=BUILD/xorg-server/ -- \ + dh_auto_configure --builddirectory='BUILD/xorg-server/' --sourcedirectory='BUILD/xorg-server/' -- \ $(confflags) \ $(confflags_main) \ $(vars) override_dh_auto_build: - dh_auto_build --builddirectory=BUILD/xorg-server/ --sourcedirectory=BUILD/xorg-server/ + dh_auto_build --builddirectory='BUILD/xorg-server/' --sourcedirectory='BUILD/xorg-server/' override_dh_auto_test: # disabled, nothing to test for x2gokdrive... override_dh_auto_install: - dh_auto_install --builddirectory=BUILD/xorg-server/ --destdir=debian/tmp/ + dh_auto_install --builddirectory='BUILD/xorg-server/' --destdir='debian/tmp/' # oh, yuck. - find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' -exec rm -f '{}' ';' + find '$(CURDIR)/debian/tmp/usr/lib/xorg' -type 'f' -name '*.la' -exec rm -f '{}' ';' override_dh_auto_clean: -dh_auto_clean override_dh_clean: -dh_clean - rm -Rf $(CURDIR)/BUILD/ + rm -Rf '$(CURDIR)/BUILD/' -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 01b5c9b1e89172bd0ced19330d081ad780559154 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:38:31 2019 +0200 x2gokdrive.spec: copy *.la file removal mechanism from debian/rules. --- debian/changelog | 1 + x2gokdrive.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d4d8be9..5e89ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Spell out each (build) dependency on one line. + Whitespace-only fixes. + Backport changes from debian/rules. + + Copy *.la file removal mechanism from debian/rules. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 08d6b02..7531853 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -190,6 +190,7 @@ popd pushd 'BUILD' make install DESTDIR='%{buildroot}' popd +find '%{buildroot}/usr/lib/xorg' -type 'f' -name '*.la' -exec rm -fv '{}' ';' %files %defattr(-,root,root) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 08df5a974970bcd61a02bc423b96c11947bed110 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:10:55 2019 +0200 debian/rules: use printf instead of echo. Plain echo doesn't even substitute escape sequences for their plain char counterparts and the -e switch is non-portable. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b10c70..e35a903 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,5 +27,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium if-else construct. + Split up subshell content onto unique lines and fix bash syntax error near "exit 1". + + Use printf instead of echo. Plain echo doesn't even substitute escape + sequences for their plain char counterparts and the -e switch is + non-portable. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index bd953da..f47e1c1 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ override_dh_auto_configure: else \ ( \ set +x; \ - echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; \ + printf '\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version %s.\n##################################################\n' "$${XORG_UPSTREAM_VERSION}"; \ exit 1; \ ); \ fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit d52044436bb821fe854b55ee1288c0e66d6d8ab9 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Oct 25 00:05:59 2019 +0200 debian/rules.flags: define NULL variable and use it throughout the file. --- debian/changelog | 2 ++ debian/rules.flags | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 076c9fb..b1cabce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,5 +37,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Avoid xargs, use find's -exec feature. + More and better quoting. + Verbosely remove *.la files. + * debian/rules.flags: + + Define NULL variable and use it throughout the file. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules.flags b/debian/rules.flags index 3e1963c..f86fd2c 100644 --- a/debian/rules.flags +++ b/debian/rules.flags @@ -1,3 +1,5 @@ +NULL = + DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) VENDOR = $(shell lsb_release -i -s) @@ -37,7 +39,8 @@ confflags += \ --disable-xnest \ --disable-xfake \ --disable-xfbdev \ - --disable-install-setuid + --disable-install-setuid \ + $(NULL) confflags_main = \ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \ @@ -64,20 +67,22 @@ confflags_main = \ --disable-wayland \ --with-sha1=libgcrypt \ --enable-xcsecurity \ - $(void) + $(NULL) ifeq ($(DEB_HOST_ARCH_OS), linux) confflags_main += \ --disable-dri3 \ --disable-xselinux \ --disable-systemd-logind \ - --without-systemd-daemon + --without-systemd-daemon \ + $(NULL) else confflags_main += \ --disable-dri3 \ --disable-xselinux \ --disable-systemd-logind \ - --without-systemd-daemon + --without-systemd-daemon \ + $(NULL) endif ifeq ($(DEB_HOST_ARCH_OS), hurd) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 78ee07761774e59d31ac542de664b0b41758eb41 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Oct 24 23:23:21 2019 +0200 debian/rules: avoid xargs, use find's -exec feature. --- debian/changelog | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e35a903..74a1c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,5 +30,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Use printf instead of echo. Plain echo doesn't even substitute escape sequences for their plain char counterparts and the -e switch is non-portable. + + Avoid xargs, use find's -exec feature. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200 diff --git a/debian/rules b/debian/rules index f47e1c1..48c9e08 100755 --- a/debian/rules +++ b/debian/rules @@ -56,8 +56,7 @@ override_dh_auto_install: dh_auto_install --builddirectory=BUILD/xorg-server/ --destdir=debian/tmp/ # oh, yuck. - find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \ - xargs rm -f + find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' -exec rm -f '{}' ';' override_dh_auto_clean: -dh_auto_clean -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit d5880d283d61532c20e73ac95a902847dacf6179 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Oct 26 22:41:53 2019 +0200 x2gokdrive.spec: sync dependency lists with debian/control. --- debian/changelog | 1 + x2gokdrive.spec | 142 ++++++++++++++++++++++++++++++++----------------------- 2 files changed, 85 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c23f66..349ce20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium redhat-rpm-macros (or the *SuSE equivalent) and is hence passed-down manually. %{__global_ldflags} is empty and unknown on some systems, so copy workaround from nx-libs for that one. + + Sync dependency lists with debian/control. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index bf11185..cc6fd9b 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -23,86 +23,112 @@ URL: https://www.x2go.org Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz # Required specifically for x2gokdrive +BuildRequires: xorg-x11-server-source +BuildRequires: libjpeg-turbo-devel BuildRequires: libpng-devel +BuildRequires: quilt %if 0%{?suse_version} BuildRequires: lsb-release %else BuildRequires: redhat-lsb %endif # x2gokdrive provides patch dirs for xorg-x11-server-source in quilt format -BuildRequires: quilt # XCB bits for Xephyr -# Copied and pasted block from: -# https://src.fedoraproject.org/rpms/xorg-x11-server/blob/master/f/xorg-x11-se... - -BuildRequires: pkgconfig(xcb-aux) +# Copied/synced with debian/control. +BuildRequires: pkgconfig(xcb) >= 1 +BuildRequires: pkgconfig(xcb-xkb) +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb-renderutil) +BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xcb-shm) BuildRequires: pkgconfig(xcb-keysyms) -BuildRequires: pkgconfig(xcb-renderutil) -# Copied and pasted block from: -# https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec -# Copied because almost all of them are required for xorg-x11-server-source -# -# Note that TigerVNC upstream does not provide distro-neutral packaging for us -# to use as a reference, just el6 and el7 specific .spec files. -# https://github.com/TigerVNC/tigervnc/tree/master/contrib/packages/rpm +BuildRequires: pkgconfig(xcb-randr) +BuildRequires: pkgconfig(xcb-xv) +BuildRequires: pkgconfig(xcb-glx) +BuildRequires: pkgconfig(xcb-xf86dri) + +# Dependencies for xorg-x11-server. BuildRequires: gcc-c++ -BuildRequires: libX11-devel BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool BuildRequires: gettext BuildRequires: gettext-autopoint -BuildRequires: libXext-devel -BuildRequires: xorg-x11-server-source -BuildRequires: libXi-devel -BuildRequires: xorg-x11-xtrans-devel -BuildRequires: xorg-x11-util-macros -BuildRequires: libXtst-devel -BuildRequires: libxkbfile-devel -BuildRequires: openssl-devel -BuildRequires: libpciaccess-devel -BuildRequires: mesa-libGL-devel -BuildRequires: libXinerama-devel -BuildRequires: freetype-devel -BuildRequires: libXdmcp-devel -BuildRequires: libxshmfence-devel -BuildRequires: desktop-file-utils -BuildRequires: java-devel -BuildRequires: jpackage-utils -BuildRequires: libjpeg-turbo-devel -BuildRequires: gnutls-devel -BuildRequires: pam-devel -BuildRequires: libdrm-devel -BuildRequires: libXt-devel -BuildRequires: pixman-devel -BuildRequires: systemd -BuildRequires: cmake -%if 0%{?fedora} > 24 || 0%{?rhel} >= 7 -BuildRequires: libXfont2-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: imake +BuildRequires: pkgconfig(fontutil) +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(damageproto) +BuildRequires: pkgconfig(fixesproto) +BuildRequires: pkgconfig(fontsproto) +BuildRequires: pkgconfig(kbproto) +BuildRequires: pkgconfig(xineramaproto) +BuildRequires: pkgconfig(randrproto) +BuildRequires: pkgconfig(recordproto) +BuildRequires: pkgconfig(renderproto) +BuildRequires: pkgconfig(resourceproto) +BuildRequires: pkgconfig(scrnsaverproto) +BuildRequires: pkgconfig(videoproto) +BuildRequires: pkgconfig(xcmiscproto) +BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(xf86bigfontproto) +BuildRequires: pkgconfig(xf86dgaproto) +BuildRequires: pkgconfig(xf86vidmodeproto) +BuildRequires: pkgconfig(presentproto) +BuildRequires: pkgconfig(bigreqsproto) +BuildRequires: pkgconfig(compositeproto) +BuildRequires: pkgconfig(xtrans) +BuildRequires: pkgconfig(Xau) +BuildRequires: pkgconfig(xdmcp) +%if 0%{?fedora} > 24 || 0%{?rhel} >= 7 || 0%{?sle_version} >= 120300 +BuildRequires: pkgconfig(xfont2) %else -BuildRequires: libXfont-devel -%endif -BuildRequires: xorg-x11-server-devel - -# Copied and pasted "server" subpackage block from: -# https://github.com/TigerVNC/tigervnc/blob/master/contrib/packages/rpm/el7/SP... -# (With TigerVNC specific stuff removed, such as Perl for their launch scripts.) -Requires: xorg-x11-xauth -Requires: xorg-x11-xinit +BuildRequires: pkgconfig(xfont) +%fi +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: pkgconfig(pciaccess) +BuildRequires: pkgconfig(libgcrypt) +BuildRequires: pkgconfig(nettle) +# We probably won't need some libudev-devel equivalent because we disable that +# feature anyway. +# Same goes for pkgconfig(libselinux). +BuildRequires: pkgconfig(audit) +BuildRequires: pkgconfig(auparse) +# Same goes for pkgconfig(libdrm). +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(libunwind) +BuildRequires: pkgconfig(xmuu) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(xres) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xv) +BuildRequires: pkgconfig(xinerama) +# RPM-specific... probably? +BuildRequires: pkgconfig(xorg-macros) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(xshmfence) -# Copied and pasted "server-minimal" subpackage block from above -Requires: xkeyboard-config -Requires: xorg-x11-xkb-utils - -%if 0%{?rhel} <= 7 -Requires: mesa-dri-drivers -Requires: x2goserver >= 4.2.0.0 -%else +Requires: xorg-x11-server-common >= 1.20.3 +%if 0%{?rhel} > 8 || 0%{?suse_version} Recommends: mesa-dri-drivers Recommends: x2goserver >= 4.2.0.0 +%else +Requires: mesa-dri-drivers +Requires: x2goserver >= 4.2.0.0 %endif %description -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 774eb591adbf8dbcf395129a037d7455552edf67 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Oct 26 22:38:50 2019 +0200 debian/control: remove dependencies that refer to disabled features. --- debian/changelog | 1 + debian/control | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 635e744..7c23f66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * debian/control: + Grammar fix. + + Remove dependencies that refer to disabled features. * x2gokdrive.spec: + Drop Debian-style formatting in description. + Typo fixes. diff --git a/debian/control b/debian/control index 609af23..ee8552c 100644 --- a/debian/control +++ b/debian/control @@ -52,10 +52,8 @@ Build-Depends: libpciaccess-dev (>= 0.12.901), libgcrypt-dev, nettle-dev, - libudev-dev (>= 151-3) [linux-any], libselinux1-dev (>= 2.0.80) [linux-any], libaudit-dev [linux-any], - libdrm-dev (>= 2.4.89) [!hurd-i386] | libdrm-dev (>= 2.4.46) [!hurd-i386], libgl1-mesa-dev (>= 9.2), libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4], libxmuu-dev (>= 1:0.99.1), @@ -63,7 +61,6 @@ Build-Depends: libx11-dev (>= 2:1.6), libxrender-dev (>= 1:0.9.0), libxi-dev (>= 2:1.6.99.1), - libdmx-dev (>= 1:1.0.1), libxpm-dev (>= 1:3.5.3), libxaw7-dev (>= 1:0.99.1), libxt-dev (>= 1:0.99.1), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 5ac41c11ff39ec524e476253e899dff37a25878d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Oct 26 22:43:10 2019 +0200 x2gokdrive.spec: rename binary package to xorg-x11-server-x2gokdrive to be consistent with Fedora/*SuSE package naming. --- debian/changelog | 2 ++ x2gokdrive.spec | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 349ce20..6fa2ccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium manually. %{__global_ldflags} is empty and unknown on some systems, so copy workaround from nx-libs for that one. + Sync dependency lists with debian/control. + + Rename binary package to xorg-x11-server-x2gokdrive to be consistent + with Fedora/*SuSE package naming. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index cc6fd9b..8a7bc03 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -122,6 +122,7 @@ BuildRequires: pkgconfig(xorg-macros) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(xshmfence) +%package -n xorg-x11-server-x2gokdrive Requires: xorg-x11-server-common >= 1.20.3 %if 0%{?rhel} > 8 || 0%{?suse_version} Recommends: mesa-dri-drivers @@ -280,7 +281,7 @@ make install DESTDIR='%{buildroot}' popd find '%{buildroot}/usr/lib/xorg' -type 'f' -name '*.la' -exec rm -fv '{}' ';' -%files +%files -n xorg-x11-server-x2gokdrive %defattr(-,root,root) %{_bindir}/x2gokdrive %exclude %{_libdir}/xorg/protocol.txt -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit fc2556209710a276898395978a506bbe84f41985 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Oct 25 01:03:05 2019 +0200 x2gokdrive.spec: copy configure flags from debian/rules{,.flags}. Most compiler flags should be getting passed down automatically through the %configure macro, but CPPFLAGS is special and seemingly not defined in redhat-rpm-macros (or the *SuSE equivalent) and is hence passed-down manually. %{__global_ldflags} is empty and unknown on some systems, so copy workaround from nx-libs for that one. --- debian/changelog | 6 ++++ x2gokdrive.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 78 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index b300328..635e744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,12 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium lsb_release, needed at package configuration time. + Enable hardening in a low-effort way. + Disable debugsource... disabling. Debug packages are actually useful! + + Copy configure flags from debian/rules{,.flags}. Most compiler flags + should be getting passed down automatically through the %configure + macro, but CPPFLAGS is special and seemingly not defined in + redhat-rpm-macros (or the *SuSE equivalent) and is hence passed-down + manually. %{__global_ldflags} is empty and unknown on some systems, so + copy workaround from nx-libs for that one. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 524590f..bf11185 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -172,24 +172,79 @@ export CXXFLAGS="$CFLAGS" pushd 'BUILD' autoreconf -fvi -# Another block from tigervnc.spec, except for the 1st option line. +# The RPM macro for the linker flags does not exist on EPEL +%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +# disable-static is so we don't get libfoo.a for modules. now if only we could +# kill the .las. %configure \ - --enable-kdrive --enable-x2gokdrive \ - --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ - --disable-xwin --disable-xephyr --disable-xwayland \ - --with-pic --disable-static \ - --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ - --with-fontdir=%{_datadir}/X11/fonts \ - --with-xkb-output=%{_localstatedir}/lib/xkb \ - --enable-install-libxf86config \ - --enable-glx --disable-dri --enable-dri2 --disable-dri3 \ - --disable-unit-tests \ - --disable-config-hal \ - --disable-config-udev \ - --with-dri-driver-path=%{_libdir}/dri \ - --without-dtrace \ - --disable-devel-docs \ - --disable-selective-werror + --libexecdir='%{_prefix}/lib/xorg' \ + --with-module-dir='%{_prefix}/lib/xorg/modules' \ + --with-serverconfig-path='%{_libexecdir}' \ + --disable-static \ + --without-dtrace \ + --disable-strict-compilation \ + --disable-debug \ + --with-int10=x86emu \ + --with-os-vendor="$(lsb_release -i -s)" \ + --with-builderstring="%{name} %{version} (https://wiki.x2go.org)" \ + --with-xkb-path=%{_datadir}/X11/xkb \ + --with-xkb-output=%{_localstatedir}/lib/xkb \ + --with-shared-memory-dir=/dev/shm \ + --enable-mitshm \ + --enable-xres \ + --disable-xcsecurity \ + --disable-tslib \ + --enable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + --enable-xorg \ + --disable-linux-acpi \ + --disable-linux-apm \ + --disable-xquartz \ + --disable-xwin \ + --disable-xnest \ + --disable-xfake \ + --disable-xfbdev \ + --disable-install-setuid \ + --disable-xshmfence \ + --disable-config-hal \ + --disable-config-udev \ + --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ + --enable-composite \ + --enable-record \ + --enable-xv \ + --disable-xvmc \ + --disable-dga \ + --enable-screensaver \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --enable-glx \ + --enable-present \ + --enable-xinerama \ + --enable-xf86vidmode \ + --enable-xace \ + --disable-xfree86-utils \ + --disable-suid-wrapper \ + --disable-dmx \ + --disable-xvfb \ + --enable-kdrive \ + --enable-x2gokdrive \ + --disable-xephyr \ + --disable-wayland \ + --with-sha1=libgcrypt \ + --enable-xcsecurity \ + --disable-dri3 \ + --disable-xselinux \ + --disable-systemd-logind \ + --without-systemd-daemon \ + --disable-dri \ + --disable-dri2 \ + --disable-glamor \ + --enable-libunwind \ + --disable-libdrm \ + --enable-unit-tests \ + CPPFLAGS="${CPPFLAGS} %{?__global_cppflags} -DPRE_RELEASE=0" \ + LDFLAGS='%{__global_ldflags}' make %{?_smp_mflags} popd -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org