Accepting request 306180 from LibreOffice:Factory
- Version bump to 4.4.3 release: * Various small fixes all around - Reformat with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/306180 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=91
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
9e355e505c
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7d1cae6c6e03854c53d415ad7a8d445b734e5929a056330c5938c1f5073a2e36
|
||||
size 164167136
|
||||
3
libreoffice-4.4.3.2.tar.xz
Normal file
3
libreoffice-4.4.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad6154c157e07adee2271cfc722a116065a2e7261ee7d93fc796f76703e88966
|
||||
size 164320100
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:70728d257d92eeab7ef35354961bcc3b7b15ec036ad9a4022715df364860221a
|
||||
size 1875932
|
||||
3
libreoffice-help-4.4.3.2.tar.xz
Normal file
3
libreoffice-help-4.4.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e10d43de0478d2aa939131e46cb8f7144e0302ee61e06a60732da9b9a03e3526
|
||||
size 1875884
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a6cba406ea1d9721ccc194290abef27635db91b518afe1af8b5c0f777022a54
|
||||
size 127785056
|
||||
3
libreoffice-translations-4.4.3.2.tar.xz
Normal file
3
libreoffice-translations-4.4.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:393e1fc8c91f1addc5a90795b23c2ee03ba6f3ad0f21664067859dcbf8b28e9f
|
||||
size 127857520
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun May 10 10:01:38 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.4.3 release:
|
||||
* Various small fixes all around
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 6 15:26:10 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Reformat with spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 3 16:45:27 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
|
||||
212
libreoffice.spec
212
libreoffice.spec
@ -16,6 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
# List of supported langs, populated bellow in the lang macros
|
||||
%global langpack_langs %{nil}
|
||||
# extensions
|
||||
%define ct2n_version 1.3.2
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.4.3
|
||||
# Old Make and bundle or not
|
||||
%if 0%{?suse_version} > 1230
|
||||
%bcond_with oldmake
|
||||
@ -53,17 +61,9 @@
|
||||
%global python_type python
|
||||
%global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
|
||||
%endif
|
||||
# List of supported langs, populated bellow in the lang macros
|
||||
%global langpack_langs %{nil}
|
||||
# extensions
|
||||
%define ct2n_version 1.3.2
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.4.2
|
||||
# This is used due to the need for beta releases
|
||||
Name: libreoffice
|
||||
Version: 4.4.2.2
|
||||
Version: 4.4.3.2
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
|
||||
@ -72,9 +72,9 @@ Url: http://www.documentfoundation.org/
|
||||
Source0: %{tarball_url}/libreoffice-%{version}.tar.xz
|
||||
Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz
|
||||
Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz
|
||||
Source99: %{name}-rpmlintrc
|
||||
# 256x256 desktop icons (bnc#722644)
|
||||
Source20: libreoffice-desktop-icons-256x256.tar.bz2
|
||||
Source99: %{name}-rpmlintrc
|
||||
# Prebuilt sofficerc for the noarch upstream branding package
|
||||
Source201: sofficerc-upstream
|
||||
# helper scripts
|
||||
@ -175,6 +175,83 @@ Patch6: 0001-Make-cpp-poppler-version.h-header-optional.patch
|
||||
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
BuildRequires: %{python_type}-devel
|
||||
BuildRequires: %{python_type}-xml
|
||||
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: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: gperf
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: hunspell-devel
|
||||
BuildRequires: hyphen-devel
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: krb5
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libcppunit-devel
|
||||
BuildRequires: liberation-fonts
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: libpoppler-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: mozilla-nspr-devel >= 4.8
|
||||
BuildRequires: mozilla-nss-devel >= 3.9.3
|
||||
BuildRequires: mythes-devel
|
||||
BuildRequires: neon-devel >= 0.26.0
|
||||
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
|
||||
Requires: %{python_type}
|
||||
Requires: google-carlito-fonts
|
||||
# Fonts are needed for tests
|
||||
Requires: liberation-fonts
|
||||
Requires: libreoffice-branding >= 4.0
|
||||
Requires: libreoffice-icon-themes = %{version}
|
||||
# We need at least english to launch ourselves.
|
||||
Requires: libreoffice-l10n-en = %{version}
|
||||
Requires(post): coreutils
|
||||
Requires(post): grep
|
||||
Requires(post): gtk2
|
||||
Requires(post): zip
|
||||
Requires(postun): coreutils
|
||||
Requires(postun): gtk2
|
||||
Requires(pre): findutils
|
||||
Provides: %{name}-draw-extensions = %{version}
|
||||
Obsoletes: %{name}-draw-extensions < %{version}
|
||||
Provides: %{name}-impress-extensions = %{version}
|
||||
Obsoletes: %{name}-impress-extensions < %{version}
|
||||
Provides: %{name}-base-extensions = %{version}
|
||||
Obsoletes: %{name}-base-extensions < %{version}
|
||||
Provides: %{name}-kde = %{version}
|
||||
Obsoletes: %{name}-kde < %{version}
|
||||
Provides: %{name}-l10n-prebuild = %{version}
|
||||
Obsoletes: %{name}-l10n-prebuild < %{version}
|
||||
Provides: %{name}-ure = %{version}
|
||||
Obsoletes: %{name}-ure < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %arm %ix86 x86_64 ppc ppc64
|
||||
%if %{with systemlibs}
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: bsh2
|
||||
@ -243,34 +320,6 @@ BuildRequires: pkgconfig(fbembed)
|
||||
%else
|
||||
BuildRequires: chrpath
|
||||
%endif
|
||||
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: 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
|
||||
@ -280,57 +329,8 @@ BuildRequires: libgltf-devel
|
||||
BuildRequires: gcc47-c++
|
||||
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
|
||||
Requires: %{python_type}
|
||||
Requires: google-carlito-fonts
|
||||
Requires: libreoffice-branding >= 4.0
|
||||
Requires: libreoffice-icon-themes = %{version}
|
||||
# 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
|
||||
Requires(post): gtk2
|
||||
Requires(post): zip
|
||||
Requires(postun): coreutils
|
||||
Requires(postun): gtk2
|
||||
Requires(pre): findutils
|
||||
Provides: %{name}-draw-extensions = %{version}
|
||||
Obsoletes: %{name}-draw-extensions < %{version}
|
||||
Provides: %{name}-impress-extensions = %{version}
|
||||
Obsoletes: %{name}-impress-extensions < %{version}
|
||||
Provides: %{name}-base-extensions = %{version}
|
||||
Obsoletes: %{name}-base-extensions < %{version}
|
||||
Provides: %{name}-kde = %{version}
|
||||
Obsoletes: %{name}-kde < %{version}
|
||||
Provides: %{name}-l10n-prebuild = %{version}
|
||||
Obsoletes: %{name}-l10n-prebuild < %{version}
|
||||
Provides: %{name}-ure = %{version}
|
||||
Obsoletes: %{name}-ure < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
|
||||
# we need a JRE for oobase and the other stuff
|
||||
%ifarch %{ix86}
|
||||
%ifarch %ix86
|
||||
Recommends: jre-32 >= 1.6
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
@ -372,8 +372,8 @@ Summary: Original Branding for LibreOffice
|
||||
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: packageand(libreoffice:branding-upstream)
|
||||
Provides: libreoffice-branding = %{version}
|
||||
Conflicts: otherproviders(libreoffice-branding)
|
||||
Provides: libreoffice-branding = %{version}
|
||||
%if %{with noarch_subpkgs}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
@ -400,9 +400,9 @@ This package provides Crystal LibreOffice icon theme. It is used in KDE3 by defa
|
||||
Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default)
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: libreoffice
|
||||
Requires(post): %{name} = %{version}
|
||||
Requires(postun): %{name} = %{version}
|
||||
Supplements: libreoffice
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
%if %{with noarch_subpkgs}
|
||||
@ -416,9 +416,9 @@ This package provides Galaxy LibreOffice icon theme. It is used in the original
|
||||
Summary: Hicontrast LibreOffice Icon Theme
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: libreoffice
|
||||
Requires(post): %{name} = %{version}
|
||||
Requires(postun): %{name} = %{version}
|
||||
Supplements: libreoffice
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
%if %{with noarch_subpkgs}
|
||||
@ -432,9 +432,9 @@ This package provides Hicontrast LibreOffice icon theme.
|
||||
Summary: Oxygen LibreOffice Icon Theme (KDE4 default)
|
||||
License: LGPL-3.0 or CC-BY-SA-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: packageand(libreoffice:kdebase4-workspace)
|
||||
Requires(post): %{name} = %{version}
|
||||
Requires(postun): %{name} = %{version}
|
||||
Supplements: packageand(libreoffice:kdebase4-workspace)
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
%if %{with noarch_subpkgs}
|
||||
@ -448,9 +448,9 @@ This package provides Oxygen LibreOffice icon theme. It is used in KDE4 by defau
|
||||
Summary: Sifr LibreOffice Icon Theme
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: libreoffice
|
||||
Requires(post): %{name} = %{version}
|
||||
Requires(postun): %{name} = %{version}
|
||||
Supplements: libreoffice
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
%if %{with noarch_subpkgs}
|
||||
@ -464,9 +464,9 @@ This package provides Sifr LibreOffice icon theme.
|
||||
Summary: Tango LibreOffice Icon Theme (GNOME default)
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Supplements: packageand(libreoffice:gnome-session)
|
||||
Requires(post): %{name} = %{version}
|
||||
Requires(postun): %{name} = %{version}
|
||||
Supplements: packageand(libreoffice:gnome-session)
|
||||
Provides: libreoffice-icon-themes = %{version}
|
||||
Obsoletes: libreoffice-icon-themes < %{version}
|
||||
%if %{with noarch_subpkgs}
|
||||
@ -633,8 +633,8 @@ Requires: gcc-c++
|
||||
Requires: make
|
||||
Requires: zip
|
||||
Recommends: java-devel
|
||||
Provides: libreoffice-ure-devel = %version
|
||||
Obsoletes: libreoffice-ure-devel < %version
|
||||
Provides: libreoffice-ure-devel = %{version}
|
||||
Obsoletes: libreoffice-ure-devel < %{version}
|
||||
%if %{with systemlibs}
|
||||
Requires: ucpp
|
||||
%endif
|
||||
@ -652,8 +652,8 @@ License: LGPL-3.0
|
||||
Group: Development/Libraries/Other
|
||||
Suggests: %{name}-sdk = %{version}
|
||||
Enhances: %{name}-sdk = %{version}
|
||||
Provides: libreoffice-ure-devel-doc = %version
|
||||
Obsoletes: libreoffice-ure-devel-doc < %version
|
||||
Provides: libreoffice-ure-devel-doc = %{version}
|
||||
Obsoletes: libreoffice-ure-devel-doc < %{version}
|
||||
|
||||
%description sdk-doc
|
||||
This package includes documentation and examples for the LibreOffice
|
||||
@ -702,7 +702,7 @@ Requires: libreoffice-calc = %{version}
|
||||
Requires: libreoffice-pyuno = %{version}
|
||||
Requires(pre): libreoffice = %{version}
|
||||
# the watchWindow extension is written in java
|
||||
%ifarch %{ix86} ppc
|
||||
%ifarch %ix86 ppc
|
||||
Requires: jre-32 > 1.5
|
||||
Recommends: jre-32 >= 1.6
|
||||
%endif
|
||||
@ -725,7 +725,7 @@ Group: Productivity/Office/Suite
|
||||
Requires: libreoffice-writer = %{version}
|
||||
Requires(pre): libreoffice = %{version}
|
||||
# the wiki extension is written in java
|
||||
%ifarch %{ix86} ppc
|
||||
%ifarch %ix86 ppc
|
||||
Requires: jre-32 > 1.5
|
||||
Recommends: jre-32 >= 1.6
|
||||
%endif
|
||||
@ -991,7 +991,7 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
|
||||
%build
|
||||
# Parallel build settings ...
|
||||
lo_jobs="%{?jobs:%{jobs}}"
|
||||
%ifarch %{arm}
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs="1"
|
||||
@ -1034,18 +1034,18 @@ export PYTHON=%{_bindir}/%{python_type}
|
||||
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_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
|
||||
export CC=%{_bindir}/gcc-4.7
|
||||
export CXX=%{_bindir}/g++-4.7
|
||||
%endif
|
||||
|
||||
%if %{with oldmake}
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-%{version}/make-4.1:$PATH:/usr/sbin"
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-%{version}/make-4.1:$PATH:%{_prefix}/sbin"
|
||||
%endif
|
||||
|
||||
# do not run configure in autogen but use macro later
|
||||
@ -1318,7 +1318,7 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3
|
||||
%endif
|
||||
|
||||
# We have ton of duped files so run over it
|
||||
%fdupes %{buildroot}/usr
|
||||
%fdupes %{buildroot}%{_prefix}
|
||||
|
||||
%pre
|
||||
# do not crate cache for bundled extensions because it is not secure
|
||||
|
||||
Loading…
Reference in New Issue
Block a user