Accepting request 295086 from LibreOffice:Factory
OBS-URL: https://build.opensuse.org/request/show/295086 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=88
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2e82f56ed6
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
|
||||
size 555291
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 8 13:06:41 UTC 2015 - andras.timar@collabora.com
|
||||
|
||||
- --disable-collada
|
||||
* reportedly it does not work in LibreOffice 4.4
|
||||
- added version numbers to some BuildRequires lines
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 8 12:26:59 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Require flow engine too on base
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 8 12:24:45 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Fix build on SLE12 and 13.1 by adding conditional for appdata install
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 8 12:03:19 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- Fixup the installed appdata.xml files: they reference a .desktop
|
||||
file that are not installed by libreoffice (boo#926375).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 2 17:11:50 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
|
||||
@ -60,8 +60,6 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
# Needed for wiki-published and always taken as bundled
|
||||
Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
# Currently not possible to unbundle, sucks
|
||||
Source2006: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
# search help icons in %{_prefix}/share
|
||||
# FIXME: make it configurable in integrate into git
|
||||
Patch0: officecfg-help-in-usr-share.diff
|
||||
@ -122,7 +120,7 @@ BuildRequires: krb5
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libabw-devel
|
||||
BuildRequires: libbase
|
||||
BuildRequires: libcdr-devel
|
||||
BuildRequires: libcdr-devel >= 0.1
|
||||
BuildRequires: libcmis-devel >= 0.5.0
|
||||
BuildRequires: libcppunit-devel
|
||||
BuildRequires: libe-book-devel >= 0.1.1
|
||||
@ -143,7 +141,7 @@ BuildRequires: liblangtag-devel
|
||||
BuildRequires: liblayout
|
||||
BuildRequires: liblcms2-devel
|
||||
BuildRequires: libloader
|
||||
BuildRequires: libmspub-devel
|
||||
BuildRequires: libmspub-devel >= 0.1
|
||||
BuildRequires: libmwaw-devel >= 0.3.4
|
||||
BuildRequires: libmysqlclient-devel
|
||||
BuildRequires: libmysqlcppconn-devel >= 1.0.6
|
||||
@ -157,8 +155,8 @@ BuildRequires: librevenge-devel >= 0.0.1
|
||||
BuildRequires: librsvg-devel
|
||||
BuildRequires: libserializer
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libvisio-devel
|
||||
BuildRequires: libwpd-devel
|
||||
BuildRequires: libvisio-devel >= 0.1
|
||||
BuildRequires: libwpd-devel >= 0.10
|
||||
BuildRequires: libwpg-devel
|
||||
BuildRequires: libwps-devel
|
||||
BuildRequires: libxml2-devel
|
||||
@ -171,7 +169,6 @@ BuildRequires: mozilla-nss-devel >= 3.9.3
|
||||
BuildRequires: mythes-devel
|
||||
BuildRequires: neon-devel >= 0.26.0
|
||||
BuildRequires: npapi-sdk
|
||||
BuildRequires: openCOLLADA-devel
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: patch
|
||||
@ -364,6 +361,7 @@ Summary: LibreOffice Base
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Requires: %{name} = %{version}
|
||||
Requires: pentaho-reporting-flow-engine
|
||||
Supplements: %{name}
|
||||
|
||||
%description base
|
||||
@ -963,7 +961,7 @@ export NOCONFIGURE=yes
|
||||
--disable-ccache \
|
||||
--enable-gltf --with-system-libgltf \
|
||||
--disable-coinmp \
|
||||
--enable-collada --with-system-opencollada \
|
||||
--disable-collada \
|
||||
--enable-symbols
|
||||
# no coinormp packages for coinmp
|
||||
|
||||
@ -1108,8 +1106,15 @@ ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.p
|
||||
ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py
|
||||
|
||||
# Install appdata files, so we're shown in gnome-software (and other, future app stores)
|
||||
# upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...]
|
||||
# fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name
|
||||
%if 0%{?suse_version} > 1315
|
||||
install -m 0755 -d %{buildroot}%{_datadir}/appdata
|
||||
install -m 0644 -p sysui/desktop/appstream-appdata/*.appdata.xml %{buildroot}%{_datadir}/appdata
|
||||
for appdata in base calc draw impress writer; do
|
||||
sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \
|
||||
sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml
|
||||
done
|
||||
%endif
|
||||
|
||||
# Remove translations source as we need more space
|
||||
rm -rf translations/source/
|
||||
@ -1220,26 +1225,36 @@ fi
|
||||
|
||||
%files -f file-lists/base_list.txt base
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/appdata/libreoffice-base.appdata.xml
|
||||
%if 0%{?suse_version} > 1315
|
||||
%{_datadir}/appdata/base.appdata.xml
|
||||
%endif
|
||||
|
||||
%files -f file-lists/calc_list.txt calc
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/appdata/libreoffice-calc.appdata.xml
|
||||
%if 0%{?suse_version} > 1315
|
||||
%{_datadir}/appdata/calc.appdata.xml
|
||||
%endif
|
||||
|
||||
%files -f file-lists/draw_list.txt draw
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/appdata/libreoffice-draw.appdata.xml
|
||||
%if 0%{?suse_version} > 1315
|
||||
%{_datadir}/appdata/draw.appdata.xml
|
||||
%endif
|
||||
|
||||
%files -f file-lists/math_list.txt math
|
||||
%defattr(-,root,root)
|
||||
|
||||
%files -f file-lists/impress_list.txt impress
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/appdata/libreoffice-impress.appdata.xml
|
||||
%if 0%{?suse_version} > 1315
|
||||
%{_datadir}/appdata/impress.appdata.xml
|
||||
%endif
|
||||
|
||||
%files -f file-lists/writer_list.txt writer
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/appdata/libreoffice-writer.appdata.xml
|
||||
%if 0%{?suse_version} > 1315
|
||||
%{_datadir}/appdata/writer.appdata.xml
|
||||
%endif
|
||||
|
||||
%files -f file-lists/postgresql_list.txt base-drivers-postgresql
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user