diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-06 04:51:59 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-06 04:51:59 +0100 |
| commit | 80e590ea1d622bd4ee9deeb12a27c7b18cf7f575 (patch) | |
| tree | d9c4a7db4f1753af36690e74e0ae8848d44221fa /nx-libs.spec | |
| parent | 05cf54af3de6f3e32e08d7bc32e10d58221a068b (diff) | |
| parent | c54558e3cbf796de60e443dd86159468a9a3c99d (diff) | |
| download | nx-libs-80e590ea1d622bd4ee9deeb12a27c7b18cf7f575.tar.gz nx-libs-80e590ea1d622bd4ee9deeb12a27c7b18cf7f575.tar.bz2 nx-libs-80e590ea1d622bd4ee9deeb12a27c7b18cf7f575.zip | |
Merge branch 'sunweaver-pr/drop-bin-wrappers' into 3.6.x
Attributes GH PR #562: https://github.com/ArcticaProject/nx-libs/pull/562
Fixes: ArcticaProject/nx-libs#546
Fixes: ArcticaProject/nx-libs#547
Diffstat (limited to 'nx-libs.spec')
| -rw-r--r-- | nx-libs.spec | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 4a64b8aed..68bec6397 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -367,10 +367,6 @@ This package provides the NX proxy (client) binary. rm -Rf nx*/configure nx*/autom4te.cache* # Install into /usr sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def -# Use multilib dirs -# We're installing binaries into %%{_libdir}/nx/bin rather than %%{_libexedir}/nx -# because upstream expects libraries and binaries in the same directory -sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl # Fix FSF address find -name LICENSE | xargs sed -i \ -e 's/59 Temple Place/51 Franklin Street/' -e 's/Suite 330/Fifth Floor/' \ @@ -575,6 +571,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %config(noreplace) %{_sysconfdir}/nxagent/nxagent.keyboard %doc doc/nxagent/README.keystrokes %{_bindir}/nxagent +# FIXME: compatibility symlink to BINDIR/nxagent, remove for 3.6.0 %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxagent %dir %{_libdir}/nx/X11 @@ -590,8 +587,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %doc doc/nxproxy/README-VALGRIND %{_bindir}/nxproxy %{_datadir}/man/man1/nxproxy.1* -%dir %{_libdir}/nx/bin -%{_libdir}/nx/bin/nxproxy %dir %{_datadir}/nx %{_datadir}/nx/VERSION.nxproxy |