From e51b0488b314174524b9f83dead547a35e7d8ed73397c70e3184b8cc1bb0b201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 15 Apr 2015 11:43:22 +0000
Subject: [PATCH] - Add conditional for appdatastore thing and redo it to
 impact the   spec less - Add systemlibs switch to be used in attempt to build
 sle11 build

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=246
---
 libreoffice.changes |  7 +++++++
 libreoffice.spec    | 31 ++++++++++++++-----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/libreoffice.changes b/libreoffice.changes
index ed20e2d..43217b6 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 15 11:42:37 UTC 2015 - tchvatal@suse.com
+
+- Add conditional for appdatastore thing and redo it to impact the
+  spec less
+- Add systemlibs switch to be used in attempt to build sle11 build
+
 -------------------------------------------------------------------
 Tue Apr 14 13:49:22 UTC 2015 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index b8deb1e..643daa2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -16,6 +16,17 @@
 #
 
 
+%if 0%{?suse_version} > 1315
+%bcond_without appdatastore
+%else
+%bcond_with appdatastore
+%endif
+%if 0%{?suse_version} > 1230
+%bcond_without systemlibs
+%else
+%bcond_with systemlibs
+%endif
+
 # List of supported langs, populated bellow in the lang macros
 %global         langpack_langs    %{nil}
 # extensions
@@ -965,7 +976,7 @@ export NOCONFIGURE=yes
 sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py
 
 # just call make here as we added the jobs in configure
-# The check phase is run here too if it is split with nocheck                 
+# The check phase is run here too if it is split with nocheck
 # install of jars get broken sometimes
 make VERBOSE=true
 
@@ -1102,11 +1113,12 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}
 # 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
+%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/" \
     sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml
+  echo "%{_datadir}/appdata/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt
 done
 %endif
 
@@ -1217,36 +1229,21 @@ exit 0
 
 %files -f file-lists/base_list.txt base
 %defattr(-,root,root)
-%if 0%{?suse_version} > 1315
-%{_datadir}/appdata/base.appdata.xml
-%endif
 
 %files -f file-lists/calc_list.txt calc
 %defattr(-,root,root)
-%if 0%{?suse_version} > 1315
-%{_datadir}/appdata/calc.appdata.xml
-%endif
 
 %files -f file-lists/draw_list.txt draw
 %defattr(-,root,root)
-%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)
-%if 0%{?suse_version} > 1315
-%{_datadir}/appdata/impress.appdata.xml
-%endif
 
 %files -f file-lists/writer_list.txt writer
 %defattr(-,root,root)
-%if 0%{?suse_version} > 1315
-%{_datadir}/appdata/writer.appdata.xml
-%endif
 
 %files -f file-lists/postgresql_list.txt base-drivers-postgresql
 %defattr(-,root,root)