[libreoffice-online] 04/05: remove the rpath directly instead of using chrpath

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libreoffice-online.

commit 743ddf661f40ba1e0f98e9dbfb0679a2dca29eff
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Nov 29 19:07:33 2017 +0000

    remove the rpath directly instead of using chrpath
---
 debian/control                    |  2 +-
 debian/patches/no-snap-rpath.diff | 13 +++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  2 --
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 8a56b15..d9308bc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:5.3~), libreoffice-core (>= 1:5.3~), dh-autoreconf, cpio, libcppunit-dev, zlib1g-dev, pkg-config, chrpath
+Build-Depends: debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:5.3~), libreoffice-core (>= 1:5.3~), dh-autoreconf, cpio, libcppunit-dev, zlib1g-dev, pkg-config
 Build-Depends-Indep: npm, node-jake, python, python-polib
 Standards-Version: 3.9.7
 
diff --git a/debian/patches/no-snap-rpath.diff b/debian/patches/no-snap-rpath.diff
new file mode 100644
index 0000000..c01289b
--- /dev/null
+++ b/debian/patches/no-snap-rpath.diff
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 7f8d0ca..9da0be7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,7 +36,7 @@ if !ENABLE_DEBUG
+ AM_CPPFLAGS += -DNDEBUG
+ endif
+ 
+-AM_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib $(ZLIB_LIBS)
++AM_LDFLAGS = -pthread $(ZLIB_LIBS)
+ 
+ if ENABLE_SSL
+ AM_LDFLAGS += -lssl -lcrypto
diff --git a/debian/patches/series b/debian/patches/series
index e00aa8b..fb627f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 no-debian-postinst-in.diff
 no-werror.diff
 no-npm-check.diff
+no-snap-rpath.diff
 lo-path.diff
 etc-default.diff
 ssl-dir.diff
diff --git a/debian/rules b/debian/rules
index e983b7d..366ac5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,6 @@ override_dh_auto_install:
 	dh_install --sourcedir=debian/tmp
 	dh_missing --sourcedir=debian/tmp --fail-missing
 
-	cd $(CURDIR)/debian/loolwsd/usr/bin && find . -type f ! -name "loolwsd-systemplate-setup" -exec chrpath -d {} \;
-
 override_dh_installinit:
 	cp sysconfig.loolwsd $(CURDIR)/debian/loolwsd.default
 	dh_installinit

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git