diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-09 22:33:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-06-09 22:35:12 +0300 |
| commit | f8b29d666d52a3f18b0125aaed309fa3e4d719fb (patch) | |
| tree | 2ad83f0ea36f40ae9c80d4db0bd0e47a13b29e88 | |
| parent | Bump version after tarball (diff) | |
| download | online-f8b29d666d52a3f18b0125aaed309fa3e4d719fb.tar.gz online-f8b29d666d52a3f18b0125aaed309fa3e4d719fb.zip | |
Include loolwsd.service and sysconfig.loolwsd in the tarball
(Instead of having them as separate SOURCEn in the loolwsd.spec.)
Both are related to systemd. The latter probably is relevant only for
openSUSE. (And I actually couldn't get what I tried doing in it to work, see
739edf9dcf464f407dfe663fb2f497b866e73333.)
| -rw-r--r-- | loolwsd/Makefile.am | 2 | ||||
| -rw-r--r-- | loolwsd/loolwsd.spec.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am index c3c5011047..36fad7bb7c 100644 --- a/loolwsd/Makefile.am +++ b/loolwsd/Makefile.am @@ -17,6 +17,8 @@ noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp LOOLWSD.hpp Lo bundled/include/LibreOfficeKit/LibreOfficeKit.h bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \ bundled/include/LibreOfficeKit/LibreOfficeKitInit.h bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h +EXTRA_DIST = loolwsd.service sysconfig.loolwsd + clean-cache: # Intentionally don't use "*" below... Avoid risk of accidentally running rm -rf /* test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f] diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in index b9c6ef2d61..7b5404fa22 100644 --- a/loolwsd/loolwsd.spec.in +++ b/loolwsd/loolwsd.spec.in @@ -22,8 +22,6 @@ Vendor: Collabora Summary: LibreOffice On-Line WebSocket Daemon License: MPL Source0: loolwsd-@PACKAGE_VERSION@.tar.gz -Source1: loolwsd.service -Source2: sysconfig.loolwsd BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0 systemd-rpm-macros # This works for now only with a CP build of 5.0, I think. The TDF # (and thus also CP) packages include the version number in their @@ -48,9 +46,9 @@ env BUILDING_FROM_RPMBUILD=yes make check %install env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot} -%__install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/loolwsd.service +%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service install -d -m 755 %{buildroot}/var/adm/fillup-templates -install -D -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates +install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates %files /usr/bin/loolwsd |