[X2Go-Commits] [nx-libs] 01/02: nx-libs.spec: Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 17 18:34:39 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 8a260b94f83fd3865ee84e49655ff75ee97eca2b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Mar 17 18:26:26 2015 +0100
nx-libs.spec: Versioned libXcomp* should obsolete unversioned libXcomp*, not libNX_Xcomp*.
Cherry-picked from branch 3.5.0.x.
Conflicts:
debian/changelog
---
debian/changelog | 7 +++++++
nx-libs.spec | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 197b257..2fbaeca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,13 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
* Use the correct library naming scheme on OS X. It differs from other
UNIX-based systems.
+ [ Mihai Moldovan ]
+ * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail
+ if it is not available.
+ * nx-libs.spec:
+ - Versioned libXcomp* should obsolete unversioned libXcomp*, not
+ libNX_Xcomp*.
+
-- X2Go Release Manager <git-admin at x2go.org> Sun, 15 Mar 2015 00:48:06 +0100
nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low
diff --git a/nx-libs.spec b/nx-libs.spec
index 9d6508c..da81fc1 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -474,7 +474,7 @@ The NX differential compression library's development files.
Group: System Environment/Libraries
Summary: NX differential compression library
Requires: %{name}%{?_isa} >= 3.5.0.29
-Obsoletes: libNX_Xcomp
+Obsoletes: libXcomp
%description -n libXcomp3
NX is a software suite from NoMachine which implements very efficient
@@ -503,7 +503,7 @@ The NX compression extensions library's development files.
Group: System Environment/Libraries
Summary: NX protocol compression extensions library
Requires: %{name}%{?_isa} >= 3.5.0.29
-Obsoletes: libNX_Xcompext
+Obsoletes: libXcompext
%description -n libXcompext3
NX is a software suite from NoMachine which implements very efficient
@@ -535,7 +535,7 @@ The NX session shadowing library's development files.
Group: System Environment/Libraries
Summary: NX session shadowing Library
Requires: %{name}%{?_isa} >= 3.5.0.29
-Obsoletes: libNX_Xcompshad
+Obsoletes: libXcompshad
%description -n libXcompshad3
NX is a software suite from NoMachine which implements very efficient
--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list