summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-01-24 21:06:32 +0100
committerAndras Timar <andras.timar@collabora.com>2018-01-24 21:06:32 +0100
commit8505104618856b758ac50f873d3bae14b3378b92 (patch)
treeb6b29c35258579688e526becca444c5cf31d0bff
parent08279df27c2bb947c1e8bf1682a85dc8dcd9f2b4 (diff)
Bump version to 3.0.0-6, require Collabora Office 5.3-38CODE-3.0.0.2
Change-Id: I60014b2ad36201557c8221308dc234c578c0e5e8
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--loolwsd.spec.in4
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e8f25a95e..f7ceb6190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.0.0-6) unstable; urgency=medium
+
+ * see the git log: http://col.la/cool30
+
+ -- Andras Timar <andras.timar@collabora.com> Tue, 24 Jan 2018 21:00:00 +0100
+
loolwsd (3.0.0-5) unstable; urgency=medium
* see the git log: http://col.la/cool30
diff --git a/debian/control b/debian/control
index 21879e8a6..3abe9b30f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.37), collaboraofficebasis5.3-core (>= 5.3.10.37), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.37), collaboraofficebasis5.3-images (>= 5.3.10.37), collaboraofficebasis5.3-impress (>= 5.3.10.37), collaboraofficebasis5.3-ooofonts (>= 5.3.10.37), collaboraofficebasis5.3-writer (>= 5.3.10.37), collaboraoffice5.3 (>= 5.3.10.37), collaboraoffice5.3-ure (>= 5.3.10.37), collaboraofficebasis5.3-en-us (>= 5.3.10.37), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.37), collaboraofficebasis5.3-en-us-res (>= 5.3.10.37), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.37), collaboraofficebasis5.3-draw (>= 5.3.10.37), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.37), collaboraofficebasis5.3-filter-data (>= 5.3.10.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.38), collaboraofficebasis5.3-core (>= 5.3.10.38), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.38), collaboraofficebasis5.3-images (>= 5.3.10.38), collaboraofficebasis5.3-impress (>= 5.3.10.38), collaboraofficebasis5.3-ooofonts (>= 5.3.10.38), collaboraofficebasis5.3-writer (>= 5.3.10.38), collaboraoffice5.3 (>= 5.3.10.38), collaboraoffice5.3-ure (>= 5.3.10.38), collaboraofficebasis5.3-en-us (>= 5.3.10.38), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.38), collaboraofficebasis5.3-en-us-res (>= 5.3.10.38), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.38), collaboraofficebasis5.3-draw (>= 5.3.10.38), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.38), collaboraofficebasis5.3-filter-data (>= 5.3.10.38)
Conflicts: collaboraofficebasis5.3-gnome-integration, collaboraofficebasis5.3-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index e819709cc..0c7097cbf 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 5%{?dist}
+Release: 6%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice5.3 >= 5.3.10.37 collaboraoffice5.3-ure >= 5.3.10.37 collaboraofficebasis5.3-core >= 5.3.10.37 collaboraofficebasis5.3-writer >= 5.3.10.37 collaboraofficebasis5.3-impress >= 5.3.10.37 collaboraofficebasis5.3-graphicfilter >= 5.3.10.37 collaboraofficebasis5.3-en-US >= 5.3.10.37 collaboraofficebasis5.3-calc >= 5.3.10.37 collaboraofficebasis5.3-en-US-res >= 5.3.10.37 collaboraofficebasis5.3-en-US-calc >= 5.3.10.37 collaboraofficebasis5.3-ooofonts >= 5.3.10.37 collaboraofficebasis5.3-images >= 5.3.10.37 collaboraofficebasis5.3-noto-fonts >= 5.3.10.37 collaboraofficebasis5.3-draw >= 5.3.10.37 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.37 collaboraofficebasis5.3-filter-data >= 5.3.10.37
+Requires: collaboraoffice5.3 >= 5.3.10.38 collaboraoffice5.3-ure >= 5.3.10.38 collaboraofficebasis5.3-core >= 5.3.10.38 collaboraofficebasis5.3-writer >= 5.3.10.38 collaboraofficebasis5.3-impress >= 5.3.10.38 collaboraofficebasis5.3-graphicfilter >= 5.3.10.38 collaboraofficebasis5.3-en-US >= 5.3.10.38 collaboraofficebasis5.3-calc >= 5.3.10.38 collaboraofficebasis5.3-en-US-res >= 5.3.10.38 collaboraofficebasis5.3-en-US-calc >= 5.3.10.38 collaboraofficebasis5.3-ooofonts >= 5.3.10.38 collaboraofficebasis5.3-images >= 5.3.10.38 collaboraofficebasis5.3-noto-fonts >= 5.3.10.38 collaboraofficebasis5.3-draw >= 5.3.10.38 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.38 collaboraofficebasis5.3-filter-data >= 5.3.10.38
Conflicts: collaboraofficebasis5.3-kde-integration collaboraofficebasis5.3-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6