From caa9e8c9a06a2c3090cdbc9bf02d07225b7fec81 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 22 Jan 2015 15:43:36 +0100
Subject: 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 d879d2b6b..f60dc9c14 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 05beae560..390172704 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
--
cgit v1.2.3