- Allow switch between py2 and py3
- Move external dependencies in conditional thus allow build on SLE11 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=248
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
6e9b3978a8
commit
a80a38ecfc
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 15 12:43:41 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Allow switch between py2 and py3
|
||||
- Move external dependencies in conditional thus allow build on
|
||||
SLE11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 15 11:56:26 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
|
||||
122
libreoffice.spec
122
libreoffice.spec
@ -22,7 +22,7 @@
|
||||
%else
|
||||
%bcond_with appdatastore
|
||||
%endif
|
||||
# GTK3 and gstreamer switch
|
||||
# GTK3, gstreamer and fresh doxygen switch
|
||||
%if 0%{?suse_version} > 1230
|
||||
%bcond_without newmedia
|
||||
%else
|
||||
@ -40,6 +40,12 @@
|
||||
%else
|
||||
%bcond_with noarch_subpkgs
|
||||
%endif
|
||||
# python2 or python3 as base
|
||||
%if 0%{?suse_version} > 1130
|
||||
%global python_type python3
|
||||
%else
|
||||
%global python_type python
|
||||
%endif
|
||||
# List of supported langs, populated bellow in the lang macros
|
||||
%global langpack_langs %{nil}
|
||||
# extensions
|
||||
@ -98,13 +104,7 @@ Patch4: nlpsolver-no-broken-help.diff
|
||||
Patch5: mediawiki-no-broken-help.diff
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
BuildRequires: ImageMagick
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: ant-nodeps
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: bison
|
||||
BuildRequires: bluez-devel
|
||||
%if %{with systemlibs}
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: bsh2
|
||||
BuildRequires: clucene-core-devel
|
||||
@ -112,41 +112,23 @@ BuildRequires: commons-codec
|
||||
BuildRequires: commons-httpclient
|
||||
BuildRequires: commons-lang
|
||||
BuildRequires: commons-logging
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: dbus-1-glib-devel
|
||||
BuildRequires: doxygen >= 1.8.4
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: flute
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glew-devel >= 1.10.0
|
||||
BuildRequires: glm-devel
|
||||
BuildRequires: glu-devel
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: gperf
|
||||
BuildRequires: graphite2-devel >= 0.9.3
|
||||
BuildRequires: gstreamer-plugins-base-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: harfbuzz-devel
|
||||
BuildRequires: hunspell-devel
|
||||
BuildRequires: hyphen-devel
|
||||
BuildRequires: icu
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: junit4
|
||||
BuildRequires: krb5
|
||||
BuildRequires: krb5-devel
|
||||
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
|
||||
# Fonts are needed for tests
|
||||
BuildRequires: liberation-fonts
|
||||
BuildRequires: libetonyek-devel >= 0.1.1
|
||||
BuildRequires: libexif
|
||||
BuildRequires: libexpat-devel
|
||||
@ -157,7 +139,6 @@ BuildRequires: libformula
|
||||
BuildRequires: libfreehand-devel
|
||||
BuildRequires: libgltf-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: liblangtag-devel
|
||||
BuildRequires: liblayout
|
||||
BuildRequires: liblcms2-devel
|
||||
@ -175,7 +156,6 @@ BuildRequires: librepository
|
||||
BuildRequires: librevenge-devel >= 0.0.1
|
||||
BuildRequires: librsvg-devel
|
||||
BuildRequires: libserializer
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libvisio-devel >= 0.1
|
||||
BuildRequires: libwpd-devel >= 0.10
|
||||
BuildRequires: libwpg-devel
|
||||
@ -183,45 +163,77 @@ BuildRequires: libwps-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: lpsolve-devel
|
||||
BuildRequires: make
|
||||
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: openldap2-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: patch
|
||||
BuildRequires: pentaho-libxml
|
||||
BuildRequires: pentaho-reporting-flow-engine
|
||||
BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: procps
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-xml
|
||||
BuildRequires: recode
|
||||
BuildRequires: rhino
|
||||
BuildRequires: sac
|
||||
BuildRequires: sane-backends-devel
|
||||
BuildRequires: ucpp
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: vigra-devel
|
||||
BuildRequires: xml-commons-apis
|
||||
BuildRequires: pkgconfig(fbembed)
|
||||
%endif
|
||||
# Fonts are needed for tests
|
||||
BuildRequires: ImageMagick
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: ant-nodeps
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: bison
|
||||
BuildRequires: bluez-devel
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: dbus-1-glib-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: gperf
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: liberation-fonts
|
||||
%if %{with newmedia}
|
||||
BuildRequires: doxygen >= 1.8.4
|
||||
BuildRequires: gstreamer-plugins-base-devel
|
||||
BuildRequires: gtk3-devel
|
||||
%else
|
||||
BuildRequires: gstreamer010-plugins-base-devel
|
||||
%endif
|
||||
BuildRequires: %{python_type}-devel
|
||||
BuildRequires: %{python_type}-xml
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: krb5
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: patch
|
||||
BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: procps
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11
|
||||
BuildRequires: xorg-x11-fonts
|
||||
BuildRequires: xz
|
||||
BuildRequires: zip
|
||||
BuildRequires: pkgconfig(fbembed)
|
||||
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}
|
||||
Requires: liberation-fonts
|
||||
Requires: libreoffice-l10n-en = %{version}
|
||||
Requires: python3
|
||||
Requires(post): coreutils
|
||||
Requires(post): grep
|
||||
Requires(post): gtk2
|
||||
@ -545,11 +557,13 @@ Group: Documentation/HTML
|
||||
Requires: %{name} = %{version}
|
||||
Requires: gcc-c++
|
||||
Requires: make
|
||||
Requires: ucpp
|
||||
Requires: zip
|
||||
Recommends: java-devel
|
||||
Provides: libreoffice-ure-devel = %version
|
||||
Obsoletes: libreoffice-ure-devel < %version
|
||||
%if %{with systemlibs}
|
||||
Requires: ucpp
|
||||
%endif
|
||||
|
||||
%description sdk
|
||||
This package contains the files needed to build plugins/add-ons for
|
||||
@ -753,25 +767,25 @@ fi \
|
||||
Summary: %{langname} Localization Files for LibreOffice \
|
||||
Group: Productivity/Office/Suite \
|
||||
Requires: %{name} = %{version} \
|
||||
Requires(post,): %{name} = %{version} \
|
||||
Requires(postun,): %{name} = %{version} \
|
||||
Provides: locale(libreoffice:%{lang}) \
|
||||
%if %{with noarch_subpkgs} \
|
||||
Requires(post,): %{name} = %{version} \
|
||||
Requires(postun,): %{name} = %{version} \
|
||||
BuildArch: noarch \
|
||||
%endif \
|
||||
%{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \
|
||||
%{-r:Requires: %{-r*}} \
|
||||
%{-p:Provides: %{name}-l10n-%{-p*}} \
|
||||
%{-T: \
|
||||
Provides: %{name}-help-%{lang} = %{version} \
|
||||
Obsoletes: %{name}-help-%{lang} < %{version} \
|
||||
Provides: %{name}-help-%{lang} = %{version} \
|
||||
Obsoletes: %{name}-help-%{lang} < %{version} \
|
||||
%{-L: \
|
||||
Provides: %{name}-help-%{-L*} = %{version} \
|
||||
Obsoletes: %{name}-help-%{-L*} < %{version} \
|
||||
Provides: %{name}-help-%{-L*} = %{version} \
|
||||
Obsoletes: %{name}-help-%{-L*} < %{version} \
|
||||
} \
|
||||
%{-p: \
|
||||
Provides: %{name}-help-%{-p*} = %{version} \
|
||||
Obsoletes: %{name}-help-%{-p*} < %{version} \
|
||||
Provides: %{name}-help-%{-p*} = %{version} \
|
||||
Obsoletes: %{name}-help-%{-p*} < %{version} \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
@ -927,11 +941,11 @@ export ARCH_FLAGS CFLAGS CXXFLAGS
|
||||
export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser'
|
||||
export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'
|
||||
|
||||
# Whack in our python3 so we don't have to use internal one
|
||||
# Whack in our python so we don't have to use internal one
|
||||
# which is quite nightmare.
|
||||
export PYTHON=%{_bindir}/python3
|
||||
export PYTHON_CFLAGS=`pkg-config --cflags python3`
|
||||
export PYTHON_LIBS=`pkg-config --libs python3`
|
||||
export PYTHON=%{_bindir}/%{python_type}
|
||||
export PYTHON_CFLAGS=`pkg-config --cflags %{python_type}`
|
||||
export PYTHON_LIBS=`pkg-config --libs %{python_type}`
|
||||
|
||||
# do not run configure in autogen but use macro later
|
||||
export NOCONFIGURE=yes
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user