aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--nx-libs.spec4
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e13b85e82..bebcf51e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
+ Don't fail if removing *.a files fails due to the files being non-present.
+ Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time.
+ Assure that BuildRoot: is set.
+ + On SLE 11.x: libX* packages are prefixed with "xorg-x11-".
* debian/roll-tarball.sh:
+ Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard,
diff --git a/nx-libs.spec b/nx-libs.spec
index bc869ef36..93549d9d1 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -73,6 +73,10 @@ Provides: nx%{?_isa} = %{version}-%{release}
# for Xinerama in NX to work:
%if 0%{?suse_version}
+%if 0%{?suse_version} < 1140
+Requires: xorg-x11-libX11%{?_isa}
+Requires: xorg-x11-libXext%{?_isa}
+%else
Requires: libX11-6%{?_isa}
Requires: libXext6%{?_isa}
%else