loolwsd/loolwsd.spec.in | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 7e09bff7a514275aa185d231a88ca0567beab817
Author: Jan Holesovsky <ke...@collabora.com>
Date: Fri Aug 5 11:26:52 2016 +0000
Some more specfile tweaks.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index ace0c87..3814682 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -46,7 +46,11 @@ Requires: libPocoCrypto42 >= 1.7.1 libPocoFoundation42
>= 1.7.1 libPocoJSO
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
%endif
+%if 0%{?name_suffix:1}
Provides: loleaflet = 1.5.8, loolwsd
+%else
+Provides: loleaflet = 1.5.8
+%endif
Obsoletes: loleaflet <= 1.5.8
%description
@@ -59,7 +63,10 @@ Obsoletes: loleaflet <= 1.5.8
%configure \
--with-lokit-path=bundled/include \
%if %{ssl_support} == "NO"
- --disable-ssl
+ --disable-ssl \
+%endif
+%if 0%{?config_options:1}
+ %{config_options}
%endif
env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
