[X2Go-Commits] [nx-libs] 01/01: Header files need not be removed anymore. They don't get installed via Makefile.nx-libs anymore.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 22 15:43:40 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit caa9e8c9a06a2c3090cdbc9bf02d07225b7fec81
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jan 22 15:43:36 2015 +0100
Header files need not be removed anymore. They don't get installed via Makefile.nx-libs anymore.
---
debian/changelog | 2 ++
nx-libs.spec | 8 --------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d879d2b..f60dc9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,8 @@ nx-libs (2:3.5.0.28-0x2go1) unstable; urgency=medium
built bin:packages.
+ Fix Xinerama symlink installation into RPM bin:package
libNX_Xinerama. (Fixes: #269).
+ + Header files need not be removed anymore. They don't get installed via
+ Makefile.nx-libs anymore.
[ Nito Martinez ]
* Add 400_nxcomp-version.full+lite.patch. Allow 4-digit version comparison
diff --git a/nx-libs.spec b/nx-libs.spec
index 05beae5..3901727 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -613,14 +613,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
echo %{_libdir}/nx > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
echo %{_libdir}/nx/X11 >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-#Remove extras, GL, and other unneeded headers
-rm -r %{buildroot}%{_includedir}/nx/{extras,GL}
-rm -r %{buildroot}%{_includedir}/nx/X11/bitmaps
-rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XInput.h
-rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XK*.h
-rm -r %{buildroot}%{_includedir}/nx/X11/extensions/*Xv*.h
-rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
-
# Needed for Xinerama support
ln -s -f ../../../../%{_lib}/libX11.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list