diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-02 14:47:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-02 14:47:22 +0100 |
| commit | 0d5a83e986f39982c0924652a3662e60b1f23162 (patch) | |
| tree | 8e9a387f0bf023d45da96998d3142b27f3639bf8 | |
| parent | dc74950637df681ee9b91af9a671876b8d859c7c (diff) | |
| download | nx-libs-0d5a83e986f39982c0924652a3662e60b1f23162.tar.gz nx-libs-0d5a83e986f39982c0924652a3662e60b1f23162.tar.bz2 nx-libs-0d5a83e986f39982c0924652a3662e60b1f23162.zip | |
On SLE 11.x: libX* packages are prefixed with "xorg-x11-".
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | nx-libs.spec | 4 |
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 |