pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Appdatastore is everywhere

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=379
This commit is contained in:
Tomáš Chvátal 2016-03-03 08:51:24 +00:00 committed by Git OBS Bridge
parent ba273a8ea3
commit 955d24fbdb
3 changed files with 5 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libreoffice-disable-services-check.patch
View File

@ -1,59 +1,3 @@
Index: libreoffice-5.1.0.3/postprocess/CppunitTest_services.mk
===================================================================
--- libreoffice-5.1.0.3.orig/postprocess/CppunitTest_services.mk
+++ libreoffice-5.1.0.3/postprocess/CppunitTest_services.mk
@@ -7,51 +7,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CppunitTest_CppunitTest,services))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,services, \
- postprocess/qa/services \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,services, \
- boost_headers \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,services, \
- cppu \
- cppuhelper \
- sal \
- test \
- vcl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,services))
-$(eval $(call gb_CppunitTest_use_api,services,oovbaapi))
-
-$(eval $(call gb_CppunitTest_use_ure,services))
-$(eval $(call gb_CppunitTest_use_vcl,services))
-
-$(eval $(call gb_CppunitTest_use_rdb,services,services))
-ifneq ($(DISABLE_PYTHON),TRUE)
-$(eval $(call gb_CppunitTest_use_python_ure,services))
-
-$(eval $(call gb_CppunitTest_use_rdb,services,pyuno))
-endif
-
-$(eval $(call gb_CppunitTest_use_configuration,services))
-
-ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_CppunitTest_use_java_ure,services))
-
-$(eval $(call gb_CppunitTest_use_jars,services,\
- smoketest \
-))
-endif
-
-$(eval $(call gb_CppunitTest_use_packages,services,\
- autotextshare_en-US \
- instsetoo_native_setup \
-))
-
# vim: set noet sw=4 ts=4:
Index: libreoffice-5.1.0.3/postprocess/Module_postprocess.mk
===================================================================
--- libreoffice-5.1.0.3.orig/postprocess/Module_postprocess.mk

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 3 08:47:48 UTC 2016 - tchvatal@suse.com
- Appdatastore is everywhere
-------------------------------------------------------------------
Wed Mar 2 16:48:33 UTC 2016 - tchvatal@suse.com

8
libreoffice.spec
View File

@ -29,12 +29,6 @@
%else
%bcond_without oldmake
%endif
# Applications datastore
%if 0%{?suse_version} > 1310
%bcond_without appdatastore
%else
%bcond_with appdatastore
%endif
# GTK3, gstreamer and fresh doxygen switch
%if 0%{?suse_version} > 1230
%bcond_without newmedia
@ -1367,7 +1361,6 @@ done
# 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 %{with appdatastore}
install -m 0755 -d %{buildroot}%{_datadir}/appdata
for appdata in base calc draw impress writer; do
sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \
@ -1378,7 +1371,6 @@ for appdata in base calc draw impress writer; do
%endif
rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml
done
%endif
# Remove pointless readmes
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/