aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--nx-libs.spec4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 61fe48f11..9281720e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,6 +83,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
+ Add Obsoletes: fields to all shared libs for marking the non-versioned
library package (names) as obsolete.
+ Don't depend on nx-libs base package with fixed version.
+ + Don't fail if removing *.a files fails due to the files being non-present.
* debian/roll-tarball.sh:
+ Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard,
diff --git a/nx-libs.spec b/nx-libs.spec
index a143050b5..77e7ad5c4 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -740,8 +740,8 @@ make install \
INSTALL_FILE="install -pm0644" \
INSTALL_PROGRAM="install -pm0755"
-# Remove static libs
-rm %{buildroot}%{_libdir}/*.a
+# Remove static libs (they don't exist on SLES, so using -f here)
+rm -f %{buildroot}%{_libdir}/*.a
# Make sure x2goagent is linked relative and on 64-bit
mkdir -p %{buildroot}%{_libdir}/x2go/bin