- Add internal make for too old system

- One more stab on poppler switch:
  * 0001-Make-cpp-poppler-version.h-header-optional.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=256

0001-Make-cpp-poppler-version.h-header-optional.patch

@@ -52,7 +52,7 @@ index d15491b..06a0120 100644
  class GfxPath;
  class GfxFont;
  class PDFDoc;
-+#if HAVE_POPPLER_VERSION_H
++#ifdef HAVE_POPPLER_VERSION_H
  #include <cpp/poppler-version.h>
 +#else
 +#define POPPLER_VERSION "0.12.3"

libreoffice.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 16 12:23:40 UTC 2015 - tchvatal@suse.com
+
+- Add internal make for too old system
+- One more stab on poppler switch:
+  * 0001-Make-cpp-poppler-version.h-header-optional.patch
+
 -------------------------------------------------------------------
 Thu Apr 16 11:45:39 UTC 2015 - tchvatal@suse.com
 

libreoffice.spec

@@ -16,6 +16,12 @@
 #
 
 
+# Old Make and bundle or not
+%if 0%{?suse_version} > 1230
+%bcond_with oldmake
+%else
+%bcond_without oldmake
+%endif
 # Applications datastore
 %if 0%{?suse_version} > 1315
 %bcond_without appdatastore
@@ -147,6 +153,8 @@ Source2058:     %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.
 Source2059:     %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 Source2060:     %{external_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
 Source2061:     %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
+# Make for old distros where too old gnumake resides
+Source3000:     http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2
 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
 # to avoid BerkleyDB incompatibility with the plain build
 # FIXME: make it configurable and push upstream
@@ -958,6 +966,15 @@ Provides additional %{langname} translations and resources for %{project}. \
 # 256x256 icons
 tar -xjf %{SOURCE20}
 
+# Unpack and compile new gmake
+%if %{with oldmake}
+tar -xjvf %{SOURCE3000}
+cd make-4.1
+CFLAGS="%{optflags}" %configure
+make %{?_smp_mflags}
+cd -
+%endif
+
 # Do not generate doxygen timestamp
 echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile
 echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
@@ -1018,6 +1035,10 @@ export CC=/usr/bin/gcc-4.7
 export CXX=/usr/bin/g++-4.7
 %endif
 
+%if %{with oldmake}
+export PATH="$RPM_BUILD_DIR/libreoffice-%{version}/make-4.1:$PATH:/usr/sbin"
+%endif
+
 # do not run configure in autogen but use macro later
 export NOCONFIGURE=yes
 ./autogen.sh

make-4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
+size 1327342