diff --git a/libreoffice.changes b/libreoffice.changes index 345b066..06e3a3d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 15 18:50:30 UTC 2015 - tchvatal@suse.com + +- Try to pass configure without system libs + ------------------------------------------------------------------- Wed Apr 15 12:43:41 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 70fba74..9693137 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -112,32 +112,26 @@ BuildRequires: commons-codec BuildRequires: commons-httpclient BuildRequires: commons-lang BuildRequires: commons-logging -BuildRequires: flex BuildRequires: flute BuildRequires: glew-devel >= 1.10.0 BuildRequires: glm-devel BuildRequires: glu-devel BuildRequires: graphite2-devel >= 0.9.3 BuildRequires: harfbuzz-devel -BuildRequires: hunspell-devel -BuildRequires: hyphen-devel BuildRequires: icu BuildRequires: junit4 BuildRequires: libabw-devel BuildRequires: libbase BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcmis-devel >= 0.5.0 -BuildRequires: libcppunit-devel BuildRequires: libe-book-devel >= 0.1.1 BuildRequires: libetonyek-devel >= 0.1.1 BuildRequires: libexif -BuildRequires: libexpat-devel BuildRequires: libexttextcat-devel >= 3.1.1 BuildRequires: libfbembed-devel BuildRequires: libfonts BuildRequires: libformula BuildRequires: libfreehand-devel -BuildRequires: libgltf-devel BuildRequires: libicu-devel BuildRequires: liblangtag-devel BuildRequires: liblayout @@ -150,7 +144,6 @@ BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libodfgen-devel >= 0.1 BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: libpagemaker-devel -BuildRequires: libpoppler-devel BuildRequires: libredland-devel BuildRequires: librepository BuildRequires: librevenge-devel >= 0.0.1 @@ -164,10 +157,6 @@ BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel BuildRequires: mdds-devel >= 0.11.2 -BuildRequires: mozilla-nspr-devel >= 4.8 -BuildRequires: mozilla-nss-devel >= 3.9.3 -BuildRequires: mythes-devel -BuildRequires: neon-devel >= 0.26.0 BuildRequires: npapi-sdk BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine @@ -181,7 +170,6 @@ BuildRequires: vigra-devel BuildRequires: xml-commons-apis BuildRequires: pkgconfig(fbembed) %endif -# Fonts are needed for tests BuildRequires: ImageMagick BuildRequires: ant BuildRequires: ant-apache-regexp @@ -195,16 +183,28 @@ BuildRequires: db-devel BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: flac-devel +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gnome-vfs2-devel BuildRequires: gperf BuildRequires: gtk2-devel +BuildRequires: hunspell-devel +BuildRequires: hyphen-devel +BuildRequires: libcppunit-devel BuildRequires: liberation-fonts +BuildRequires: libexpat-devel +BuildRequires: libpoppler-devel +BuildRequires: mozilla-nspr-devel >= 4.8 +BuildRequires: mozilla-nss-devel >= 3.9.3 +BuildRequires: mythes-devel +BuildRequires: neon-devel >= 0.26.0 %if %{with newmedia} BuildRequires: doxygen >= 1.8.4 BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk3-devel +BuildRequires: libgltf-devel %else +BuildRequires: gcc47-c++ BuildRequires: gstreamer010-plugins-base-devel %endif BuildRequires: %{python_type}-devel @@ -227,12 +227,13 @@ BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts BuildRequires: xz BuildRequires: zip +Requires: %{python_type} Requires: google-carlito-fonts Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version} -# We need at least english to launch ourselves. -Requires: %{python_type} +# Fonts are needed for tests Requires: liberation-fonts +# We need at least english to launch ourselves. Requires: libreoffice-l10n-en = %{version} Requires(post): coreutils Requires(post): grep @@ -943,8 +944,19 @@ export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOL # Whack in our python so we don't have to use internal one # which is quite nightmare. export PYTHON=%{_bindir}/%{python_type} +%if %{with newmedia} export PYTHON_CFLAGS=`pkg-config --cflags %{python_type}` export PYTHON_LIBS=`pkg-config --libs %{python_type}` +%else +export PYTHON_CFLAGS=`%{python_type}-config --cflags` +export PYTHON_LIBS=`%{python_type}-config --libs` +%endif + +# Old systems need help in finding the gcc +%if !%{with newmedia} +export CC=/usr/bin/gcc-4.7 +export CXX=/usr/bin/g++-4.7 +%endif # do not run configure in autogen but use macro later export NOCONFIGURE=yes @@ -954,14 +966,30 @@ export NOCONFIGURE=yes --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ - --with-system-headers \ %if %{with systemlibs} + --with-system-headers \ --with-system-libs \ --with-system-jars \ --with-system-ucpp \ %else --without-system-libs \ --without-system-jars \ + --without-system-headers \ + --without-junit \ + --with-system-expat \ + --with-system-curl \ + --with-system-neon \ + --with-system-hunspell \ + --with-system-mythes \ + --with-system-bluez \ + --with-system-mesa-headers \ + --with-system-openldap \ + --with-system-odbc \ + --with-system-nss \ + --with-system-jpeg \ + --with-system-cppunit \ + --with-system-poppler \ + --with-system-openssl \ %endif --with-system-dicts \ --with-vendor=SUSE \ @@ -978,11 +1006,15 @@ export NOCONFIGURE=yes %if %{with newmedia} --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ - --disable-gtk3 \ + --enable-gtk3 \ + --with-doxygen \ + -enable-gltf \ %else --enable-gstreamer-0-10 \ --disable-gstreamer-1-0 \ - --enable-gtk3 \ + --disable-gtk3 \ + --without-doxygen \ + --disable-gltf \ %endif --enable-release-build \ --enable-split-app-modules \ @@ -1003,7 +1035,6 @@ export NOCONFIGURE=yes --with-external-thes-dir=%{_datadir}/mythes \ --with-help \ --enable-odk \ - --with-doxygen \ --enable-kde4 \ --enable-evolution2 \ --enable-lockdown \ @@ -1019,7 +1050,6 @@ export NOCONFIGURE=yes --disable-vlc \ --enable-neon \ --disable-ccache \ - --enable-gltf \ --disable-coinmp \ --disable-collada \ --enable-symbols