Commit 804584cb authored by Mike Gabriel's avatar Mike Gabriel

Don't fail if removing *.a files fails due to the files being non-present.

parent 0b9fce27
...@@ -83,6 +83,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium ...@@ -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 + Add Obsoletes: fields to all shared libs for marking the non-versioned
library package (names) as obsolete. library package (names) as obsolete.
+ Don't depend on nx-libs base package with fixed version. + 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: * debian/roll-tarball.sh:
+ Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard,
......
...@@ -740,8 +740,8 @@ make install \ ...@@ -740,8 +740,8 @@ make install \
INSTALL_FILE="install -pm0644" \ INSTALL_FILE="install -pm0644" \
INSTALL_PROGRAM="install -pm0755" INSTALL_PROGRAM="install -pm0755"
# Remove static libs # Remove static libs (they don't exist on SLES, so using -f here)
rm %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.a
# Make sure x2goagent is linked relative and on 64-bit # Make sure x2goagent is linked relative and on 64-bit
mkdir -p %{buildroot}%{_libdir}/x2go/bin mkdir -p %{buildroot}%{_libdir}/x2go/bin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment