[X2Go-Commits] [nx-libs] 02/02: nx-libs.spec: let x2goagent conflict with pre-4.0.1.21 x2goserver versions.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit 288cc6fec0826234fd6de145ab6cb284bdd2280b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Nov 2 07:18:27 2017 +0100

    nx-libs.spec: let x2goagent conflict with pre-4.0.1.21 x2goserver versions.
    
    Needed for x2goagent.options file move.
---
 debian/changelog | 2 ++
 nx-libs.spec     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bab83c8..e2f7db4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
       v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
     - Drop ugly sed hack to push optflags to build system.
     - Pass CDEBUGSFLAGS and friends directly to the make command in %build.
+    - Let x2goagent conflict with pre-4.0.1.21 x2goserver versions. Needed for
+      x2goagent.options file move.
   * debian/:
     - Add x2goagent.options file for compatibility with x2goserver nightly.
   * debian/roll-tarballs.sh:
diff --git a/nx-libs.spec b/nx-libs.spec
index cdf362d..e72e01f 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -675,6 +675,7 @@ Group:          Applications/System
 Summary:        X2Go Agent
 Requires:       nxagent
 Provides:       x2goagent-virtual
+Conflicts:      x2goserver < 4.0.1.21
 
 %description -n x2goagent
 X2Go Agent functionality has been completely incorporated into

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git