aboutsummaryrefslogtreecommitdiff
path: root/nx-libs.spec
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-04 15:32:58 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 10:06:00 +0200
commit5c65e9b4071b31f22a78fe273118ab6575914237 (patch)
tree3f5980fe59102556eb67b3d2e1e1aa4f48def140 /nx-libs.spec
parenta1a7b1aab10093f869bac49f6bf20531fcb0ed0a (diff)
downloadnx-libs-5c65e9b4071b31f22a78fe273118ab6575914237.tar.gz
nx-libs-5c65e9b4071b31f22a78fe273118ab6575914237.tar.bz2
nx-libs-5c65e9b4071b31f22a78fe273118ab6575914237.zip
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.
Diffstat (limited to 'nx-libs.spec')
-rw-r--r--nx-libs.spec11
1 files changed, 9 insertions, 2 deletions
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