diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:08:55 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:08:55 +0200 |
| commit | dd5f5b56b48127641ca2bf70a272f60872f2568b (patch) | |
| tree | e1b687d9c6a658c81801c8fc9dba9a063f22b3da /nx-libs.spec | |
| parent | da7261cfe0244fcf329e0597f9d122293fd4f9eb (diff) | |
| parent | 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c (diff) | |
| download | nx-libs-dd5f5b56b48127641ca2bf70a272f60872f2568b.tar.gz nx-libs-dd5f5b56b48127641ca2bf70a272f60872f2568b.tar.bz2 nx-libs-dd5f5b56b48127641ca2bf70a272f60872f2568b.zip | |
Merge branch 'sunweaver-pr/ld-loading-libX11-hack' into 3.6.x
Attributes GH PR #172: https://github.com/ArcticaProject/nx-libs/pull/172
Reviewed by: Mihai Moldovan <ionic@ionic.de> -- Fri Jul 1 00:38:00 CEST 2016
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Fri Jul 1 00:38:00 CEST 2016
Diffstat (limited to 'nx-libs.spec')
| -rw-r--r-- | nx-libs.spec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 5adb42ca2..418a83bdd 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -329,8 +329,7 @@ sed -i -e 's#-O3#%{optflags}#' nx-X11/config/cf/host.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,' Makefile nx-X11/config/cf/X11.tmpl -sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/* +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/' \ |