aboutsummaryrefslogtreecommitdiff
path: root/nx-libs.spec
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-03 00:19:26 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-15 16:38:26 +0100
commit80b5de3f55fd493ee85f2a78b731ff05e6363e43 (patch)
tree29930f1da570f462521557ee426a96d53eef1e2c /nx-libs.spec
parentcae394b45f499817ef5caa9876a8e40db6484b83 (diff)
downloadnx-libs-80b5de3f55fd493ee85f2a78b731ff05e6363e43.tar.gz
nx-libs-80b5de3f55fd493ee85f2a78b731ff05e6363e43.tar.bz2
nx-libs-80b5de3f55fd493ee85f2a78b731ff05e6363e43.zip
nxcompext: Move code into Xserver subtree, as nxcompext requires Xserver includes at build time.
Fixes ArcticaProject/nx-libs#276.
Diffstat (limited to 'nx-libs.spec')
-rw-r--r--nx-libs.spec48
1 files changed, 2 insertions, 46 deletions
diff --git a/nx-libs.spec b/nx-libs.spec
index d6036a152..5a6635de8 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -213,39 +213,6 @@ using X applications over a network, especially a slow one.
This package contains the NX differential compression library for X11.
-%package -n libXcompext-devel
-Group: Development/Libraries
-Summary: Development files for the NX compression extensions library
-Requires: libXcompext3%{?_isa} = %{version}-%{release}
-Requires: libNX_X11-devel%{?_isa} = %{version}-%{release}
-Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
-
-%description -n libXcompext-devel
-NX is a software suite from NoMachine which implements very efficient
-compression of the X11 protocol. This increases performance when
-using X applications over a network, especially a slow one.
-
-The NX compression extensions library's development files.
-
-
-%package -n libXcompext3
-Group: System Environment/Libraries
-Summary: NX protocol compression extensions library
-Requires: %{name}%{?_isa} >= 3.5.0.29
-Obsoletes: libXcompext <= 3.5.1
-Provides: libXcompext = %{version}-%{release}
-Obsoletes: libXcompext%{?_isa} <= 3.5.1
-Provides: libXcompext%{?_isa} = %{version}-%{release}
-
-%description -n libXcompext3
-NX is a software suite from NoMachine which implements very efficient
-compression of the X11 protocol. This increases performance when
-using X applications over a network, especially a slow one.
-
-This package provides the library to support additional features to
-the core NX library.
-
-
%package -n libXcompshad-devel
Group: Development/Libraries
Summary: Development files for the NX session shadowing library
@@ -317,6 +284,8 @@ Obsoletes: nx%{?_isa} < 3.5.0-19
Provides: nx%{?_isa} = %{version}-%{release}
Conflicts: nxauth < 3.5.99.1
Conflicts: nxauth%{?_isa} < 3.5.99.1
+Conflicts: libXcompext < 3.5.99.3
+Conflicts: libXcompext%{?_isa} < 3.5.99.3
%if 0%{?suse_version}
Requires: xorg-x11-fonts-core
%endif
@@ -426,12 +395,10 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%post -p /sbin/ldconfig
%post -n libNX_X11-6 -p /sbin/ldconfig
%post -n libXcomp3 -p /sbin/ldconfig
-%post -n libXcompext3 -p /sbin/ldconfig
%post -n libXcompshad3 -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun -n libNX_X11-6 -p /sbin/ldconfig
%postun -n libXcomp3 -p /sbin/ldconfig
-%postun -n libXcompext3 -p /sbin/ldconfig
%postun -n libXcompshad3 -p /sbin/ldconfig
%files
@@ -483,17 +450,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%doc doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
%_libdir/libXcomp.so.3*
-%files -n libXcompext-devel
-%defattr(-,root,root)
-%_libdir/libXcompext.so
-%{_includedir}/nx/NXlib.h
-%{_libdir}/pkgconfig/nxcompext.pc
-
-%files -n libXcompext3
-%defattr(-,root,root)
-%doc COPYING
-%_libdir/libXcompext.so.3*
-
%files -n libXcompshad-devel
%defattr(-,root,root)
%_libdir/libXcompshad.so