From 5c65e9b4071b31f22a78fe273118ab6575914237 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 4 Jul 2016 15:32:58 +0200 Subject: nx-libs.spec: Fix various issues since last testing the RPM builds of nx-libs: - Inject LIBDIR rather than USRLIBDIR into nx-libs's main Makefile - Install include files Xauth.h into libNX_X11-devel. - Install hi-jacking libX11 library symlinks. - Install VERSION.nx* files into nxagent / nxproxy packages. --- nx-libs.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'nx-libs.spec') diff --git a/nx-libs.spec b/nx-libs.spec index b4388db38..d9ec6d80d 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -353,13 +353,13 @@ chmod a+x my_configure; export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export LOCAL_LDFLAGS="%{__global_ldflags}" export CDEBUGFLAGS="%{__global_cppflags} %{__global_cflags}" -make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} +make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} SHLIBDIR=%{_libdir} %install make install \ DESTDIR=%{buildroot} \ PREFIX=%{_prefix} \ - USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} \ + LIBDIR=%{_libdir} SHLIBDIR=%{_libdir} \ INSTALL_DIR="install -dm0755" \ INSTALL_FILE="install -pm0644" \ INSTALL_PROGRAM="install -pm0755" @@ -417,6 +417,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %dir %{_includedir}/nx %dir %{_includedir}/nx-X11 %{_includedir}/nx-X11/ImUtil.h +%{_includedir}/nx-X11/Xauth.h %{_includedir}/nx-X11/XKBlib.h %{_includedir}/nx-X11/Xcms.h %{_includedir}/nx-X11/Xlib.h @@ -538,8 +539,12 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_bindir}/nxagent %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxagent +%dir %{_libdir}/nx-X11 +%{_libdir}/nx-X11/libX11.so* %{_datadir}/pixmaps/nxagent.xpm +%dir %{_datadir}/nx %{_datadir}/nx/rgb +%{_datadir}/nx/VERSION.nxagent %{_datadir}/man/man1/nxagent.1* %files -n nxproxy @@ -549,6 +554,8 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_datadir}/man/man1/nxproxy.1* %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxproxy +%dir %{_datadir}/nx +%{_datadir}/nx/VERSION.nxproxy %changelog -- cgit v1.2.3 From 59eab0a8258d96a1775713e470c4748a0cdf1e50 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 4 Jul 2016 16:27:34 +0200 Subject: nx-libs.spec: Add correct Obsoletes:/Provides: fields for lib* bin:packages. --- nx-libs.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'nx-libs.spec') diff --git a/nx-libs.spec b/nx-libs.spec index d9ec6d80d..666763891 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -111,7 +111,10 @@ applications over a network, especially a slow one. Group: System Environment/Libraries Summary: Core NX protocol client library Requires: %{name}%{?_isa} >= 3.5.0.29 -Obsoletes: libNX_X11 +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} %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif @@ -172,7 +175,10 @@ 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: libXcomp +Obsoletes: libXcomp <= 3.5.1 +Provides: libXcomp = %{version}-%{release} +Obsoletes: libXcomp%{?_isa} <= 3.5.1 +Provides: libXcomp%{?_isa} = %{version}-%{release} %description -n libXcomp3 NX is a software suite from NoMachine which implements very efficient @@ -201,7 +207,10 @@ 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: libXcompext +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 @@ -232,7 +241,10 @@ 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: libXcompshad +Obsoletes: libXcompshad <= 3.5.1 +Provides: libXcompshad = %{version}-%{release} +Obsoletes: libXcompshad%{?_isa} <= 3.5.1 +Provides: libXcompshad%{?_isa} = %{version}-%{release} %description -n libXcompshad3 NX is a software suite from NoMachine which implements very efficient -- cgit v1.2.3 From 6dded30a79d4f97b34fbac7fbacbf6673d51b612 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 4 Jul 2016 16:31:18 +0200 Subject: nx-libs.spec: Let nxagent conflict with nxauth, which is not provided anymore. --- nx-libs.spec | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nx-libs.spec') diff --git a/nx-libs.spec b/nx-libs.spec index 666763891..e0849e579 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -290,6 +290,8 @@ Obsoletes: nx < 3.5.0-19 Provides: nx = %{version}-%{release} 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 %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif -- cgit v1.2.3 From 1910142cf3201a5c815836ea59fe21d40ad3589a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 4 Jul 2016 16:34:38 +0200 Subject: nx-libs.spec: Let libNX_X11-6 and libNX_X11-devel conflict with deprecated libXau6 and libXau-devel. --- nx-libs.spec | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nx-libs.spec') 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 -- cgit v1.2.3 From 058ae3e767d68501233db2db8fb5108335902b22 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 09:54:47 +0200 Subject: nx-libs.spec: Add Conflicts: fields for removed shared library bin:packages. libNX_Xcomposite1 < 3.5.99.1 libNX_Xcomposite1%{?_isa} < 3.5.99.1 libNX_Xdamage1 < 3.5.99.1 libNX_Xdamage1%{?_isa} < 3.5.99.1 libNX_Xdmcp6 < 3.5.99.1 libNX_Xdmcp6%{?_isa} < 3.5.99.1 libNX_Xext6 < 3.5.99.1 libNX_Xext6%{?_isa} < 3.5.99.1 libNX_Xfixes3 < 3.5.99.1 libNX_Xfixes3%{?_isa} < 3.5.99.1 libNX_Xinerama1 < 3.5.99.1 libNX_Xinerama1%{?_isa} < 3.5.99.1 libNX_Xpm4 < 3.5.99.1 libNX_Xpm4%{?_isa} < 3.5.99.1 libNX_Xrandr2 < 3.5.99.1 libNX_Xrandr2%{?_isa} < 3.5.99.1 libNX_Xrender1 < 3.5.99.1 libNX_Xrender1%{?_isa} < 3.5.99.1 libNX_Xtst6 < 3.5.99.1 libNX_Xtst6%{?_isa} < 3.5.99.1 Fixes ArcticaProject/nx-libs#70. --- nx-libs.spec | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'nx-libs.spec') diff --git a/nx-libs.spec b/nx-libs.spec index beee3a8c6..110a1d52a 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -117,6 +117,26 @@ 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 +Conflicts: libNX_Xcomposite1 < 3.5.99.1 +Conflicts: libNX_Xcomposite1%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xdamage1 < 3.5.99.1 +Conflicts: libNX_Xdamage1%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xdmcp6 < 3.5.99.1 +Conflicts: libNX_Xdmcp6%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xext6 < 3.5.99.1 +Conflicts: libNX_Xext6%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xfixes3 < 3.5.99.1 +Conflicts: libNX_Xfixes3%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xinerama1 < 3.5.99.1 +Conflicts: libNX_Xinerama1%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xpm4 < 3.5.99.1 +Conflicts: libNX_Xpm4%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xrandr2 < 3.5.99.1 +Conflicts: libNX_Xrandr2%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xrender1 < 3.5.99.1 +Conflicts: libNX_Xrender1%{?_isa} < 3.5.99.1 +Conflicts: libNX_Xtst6 < 3.5.99.1 +Conflicts: libNX_Xtst6%{?_isa} < 3.5.99.1 %if 0%{?suse_version} Requires: xorg-x11-fonts-core %endif -- cgit v1.2.3