[Libreoffice-commits] online.git: 2 commits - loolwsd/debian loolwsd/loolwsd.spec.in

[Andras Timar]

 loolwsd/debian/rules    |    2 +-
 loolwsd/loolwsd.spec.in |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2e0d8954852bcdda72db91e2ae5e24eb95974a31
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Apr 14 15:26:51 2016 +0200

    loolwsd: define sysconfdir for deb package

diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 5ac9c8a..91b2294 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --localstatedir=/var --with-lokit-path=`pwd`/bundled/include --disable-tests
+CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include --disable-tests
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
commit ea94e957c1a8e32213607c195f724cda7b2239f4
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Apr 14 15:14:59 2016 +0200

    loolwsd: rpm install of config files

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index b7392cc..fb7ee60 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -66,7 +66,10 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -ex
 /usr/share/loolwsd/discovery.xml
 %{_unitdir}/loolwsd.service
 /var/adm/fillup-templates/sysconfig.loolwsd
+
+%config(noreplace)
 /etc/cron.d/loolwsd.cron
+/etc/loolwsd/loolwsd.xml
 
 %doc README