diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-29 12:40:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-29 12:40:22 +0100 |
| commit | 804584cb18349efb48ca7501af4b43b7641011ad (patch) | |
| tree | bb063395eeb45c33fb5e37900ae84a1531f25442 | |
| parent | 0b9fce27be48553f578529ea41da5baf6a22a22f (diff) | |
| download | nx-libs-804584cb18349efb48ca7501af4b43b7641011ad.tar.gz nx-libs-804584cb18349efb48ca7501af4b43b7641011ad.tar.bz2 nx-libs-804584cb18349efb48ca7501af4b43b7641011ad.zip | |
Don't fail if removing *.a files fails due to the files being non-present.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | nx-libs.spec | 4 |
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 |