aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-04 16:34:38 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 10:06:00 +0200
commit1910142cf3201a5c815836ea59fe21d40ad3589a (patch)
tree777c63d3dc3969184da237dad2735638e5d03be8
parent6dded30a79d4f97b34fbac7fbacbf6673d51b612 (diff)
downloadnx-libs-1910142cf3201a5c815836ea59fe21d40ad3589a.tar.gz
nx-libs-1910142cf3201a5c815836ea59fe21d40ad3589a.tar.bz2
nx-libs-1910142cf3201a5c815836ea59fe21d40ad3589a.zip
nx-libs.spec: Let libNX_X11-6 and libNX_X11-devel conflict with deprecated libXau6 and libXau-devel.
-rw-r--r--nx-libs.spec4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-libs.spec b/nx-libs.spec
index e0849e579..beee3a8c6 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -115,6 +115,8 @@ Obsoletes: libNX_X11 < 3.5.0.30
Provides: libNX_X11 = %{version}-%{release}
Obsoletes: libNX_X11%{?_isa} < 3.5.0.30
Provides: libNX_X11%{?_isa} = %{version}-%{release}
+Conflicts: libNX_Xau6 < 3.5.99.1
+Conflicts: libNX_Xau6%{?_isa} < 3.5.99.1
%if 0%{?suse_version}
Requires: xorg-x11-fonts-core
%endif
@@ -139,6 +141,8 @@ Group: Development/Libraries
Summary: Development files for the Core NX protocol library
Requires: libNX_X11-6%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
+Conflicts: libNX_Xau-devel < 3.5.99.1
+Conflicts: libNX_Xau-devel%{?_isa} < 3.5.99.1
%description -n libNX_X11-devel
NX is a software suite which implements very efficient compression of