From c2235af69d0e07559e4b1c4d06713f14d7ad71733fd0c6983c7ea552306b41be Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 30 Mar 2015 14:25:14 +0000 Subject: [PATCH 1/3] - added version numbers to some BuildRequires lines - build does not require python3-lxml - build requires librevenge-devel >= 0.0.1 - vlc media backend is broken, don't use it. Only gstreamer should be used. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=232 --- libreoffice.changes | 8 ++++++++ libreoffice.spec | 25 ++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 813570d..e8eeeb0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 30 14:20:04 UTC 2015 - andras.timar@collabora.com + +- added version numbers to some BuildRequires lines +- build does not require python3-lxml +- build requires librevenge-devel >= 0.0.1 +- vlc media backend is broken, don't use it. Only gstreamer should be used. + ------------------------------------------------------------------- Fri Mar 20 14:42:33 UTC 2015 - dimstar@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index 2d4f820..e2e216f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -108,7 +108,7 @@ BuildRequires: glm-devel BuildRequires: glu-devel BuildRequires: gnome-vfs2-devel BuildRequires: gperf -BuildRequires: graphite2-devel +BuildRequires: graphite2-devel >= 0.9.3 BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk3-devel @@ -123,15 +123,15 @@ BuildRequires: krb5-devel BuildRequires: libabw-devel BuildRequires: libbase BuildRequires: libcdr-devel -BuildRequires: libcmis-devel +BuildRequires: libcmis-devel >= 0.5.0 BuildRequires: libcppunit-devel -BuildRequires: libe-book-devel +BuildRequires: libe-book-devel >= 0.1.1 # Fonts are needed for tests BuildRequires: liberation-fonts -BuildRequires: libetonyek-devel +BuildRequires: libetonyek-devel >= 0.1.1 BuildRequires: libexif BuildRequires: libexpat-devel -BuildRequires: libexttextcat-devel +BuildRequires: libexttextcat-devel >= 3.1.1 BuildRequires: libfbembed-devel BuildRequires: libfonts BuildRequires: libformula @@ -144,7 +144,7 @@ BuildRequires: liblayout BuildRequires: liblcms2-devel BuildRequires: libloader BuildRequires: libmspub-devel -BuildRequires: libmwaw-devel +BuildRequires: libmwaw-devel >= 0.3.4 BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libodfgen-devel @@ -153,6 +153,7 @@ BuildRequires: libpagemaker-devel BuildRequires: libpoppler-devel BuildRequires: libredland-devel BuildRequires: librepository +BuildRequires: librevenge-devel >= 0.0.1 BuildRequires: librsvg-devel BuildRequires: libserializer BuildRequires: libtool @@ -164,11 +165,11 @@ BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel BuildRequires: make -BuildRequires: mdds-devel >= 0.8.0 -BuildRequires: mozilla-nspr-devel -BuildRequires: mozilla-nss-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 +BuildRequires: neon-devel >= 0.26.0 BuildRequires: npapi-sdk BuildRequires: openCOLLADA-devel BuildRequires: openldap2-devel @@ -181,7 +182,6 @@ BuildRequires: perl-Compress-Zlib BuildRequires: postgresql-devel BuildRequires: procps BuildRequires: python3-devel -BuildRequires: python3-lxml BuildRequires: python3-xml BuildRequires: recode BuildRequires: rhino @@ -191,7 +191,6 @@ BuildRequires: ucpp BuildRequires: unixODBC-devel BuildRequires: unzip BuildRequires: vigra-devel -BuildRequires: vlc-devel BuildRequires: xml-commons-apis BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts @@ -958,7 +957,7 @@ export NOCONFIGURE=yes --enable-ext-mariadb-connector \ --enable-scripting-beanshell \ --enable-scripting-javascript \ - --enable-vlc \ + --disable-vlc \ --enable-neon \ --with-system-ucpp \ --disable-ccache \ From 0458378147abf43e5b84c3373a615dbf71d4b12f3aeb9486679c6b5fc7af0225 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 30 Mar 2015 14:31:38 +0000 Subject: [PATCH 2/3] - BuildRequires: libodfgen-devel >= 0.1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=233 --- libreoffice.changes | 5 +++++ libreoffice.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index e8eeeb0..4b5ac50 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 30 14:31:03 UTC 2015 - andras.timar@collabora.com + +- BuildRequires: libodfgen-devel >= 0.1 + ------------------------------------------------------------------- Mon Mar 30 14:20:04 UTC 2015 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index e2e216f..d3fdca6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -147,7 +147,7 @@ BuildRequires: libmspub-devel BuildRequires: libmwaw-devel >= 0.3.4 BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel >= 1.0.6 -BuildRequires: libodfgen-devel +BuildRequires: libodfgen-devel >= 0.1 BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: libpagemaker-devel BuildRequires: libpoppler-devel @@ -884,7 +884,7 @@ fi # make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... -ARCH_FLAGS="%{optflags}" +ARCH_FLAGS="%{optflags}" CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS From 8cd0d6e04c742aecb21fa4cf21b615672989afd8bf094ecc665e2f93fb954552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Apr 2015 17:13:45 +0000 Subject: [PATCH 3/3] - Version bump to 4.4.2: * 2nd bugfix update for the 4.4 series OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=235 --- libreoffice-4.4.1.2.tar.xz | 3 --- libreoffice-4.4.2.2.tar.xz | 3 +++ libreoffice-help-4.4.1.2.tar.xz | 3 --- libreoffice-help-4.4.2.2.tar.xz | 3 +++ libreoffice-translations-4.4.1.2.tar.xz | 3 --- libreoffice-translations-4.4.2.2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 4 ++-- 8 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 libreoffice-4.4.1.2.tar.xz create mode 100644 libreoffice-4.4.2.2.tar.xz delete mode 100644 libreoffice-help-4.4.1.2.tar.xz create mode 100644 libreoffice-help-4.4.2.2.tar.xz delete mode 100644 libreoffice-translations-4.4.1.2.tar.xz create mode 100644 libreoffice-translations-4.4.2.2.tar.xz diff --git a/libreoffice-4.4.1.2.tar.xz b/libreoffice-4.4.1.2.tar.xz deleted file mode 100644 index 1850dc8..0000000 --- a/libreoffice-4.4.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ed40b6554674dc0b010af0599b94066334fe80f3dc8a3fb34543f9d847b475d -size 164055640 diff --git a/libreoffice-4.4.2.2.tar.xz b/libreoffice-4.4.2.2.tar.xz new file mode 100644 index 0000000..d991ee1 --- /dev/null +++ b/libreoffice-4.4.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d1cae6c6e03854c53d415ad7a8d445b734e5929a056330c5938c1f5073a2e36 +size 164167136 diff --git a/libreoffice-help-4.4.1.2.tar.xz b/libreoffice-help-4.4.1.2.tar.xz deleted file mode 100644 index 5d3b375..0000000 --- a/libreoffice-help-4.4.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07be8ca80e3552668f496584c2d9fbc3cce8a5e3947531c62c67bdf1bbb95d10 -size 1875832 diff --git a/libreoffice-help-4.4.2.2.tar.xz b/libreoffice-help-4.4.2.2.tar.xz new file mode 100644 index 0000000..46492ce --- /dev/null +++ b/libreoffice-help-4.4.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70728d257d92eeab7ef35354961bcc3b7b15ec036ad9a4022715df364860221a +size 1875932 diff --git a/libreoffice-translations-4.4.1.2.tar.xz b/libreoffice-translations-4.4.1.2.tar.xz deleted file mode 100644 index bf8d792..0000000 --- a/libreoffice-translations-4.4.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3c25e6ac14279c599e9cab3a44bd54de0c368f6a530226daf613d9a9a4c3728 -size 127649116 diff --git a/libreoffice-translations-4.4.2.2.tar.xz b/libreoffice-translations-4.4.2.2.tar.xz new file mode 100644 index 0000000..bd63495 --- /dev/null +++ b/libreoffice-translations-4.4.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a6cba406ea1d9721ccc194290abef27635db91b518afe1af8b5c0f777022a54 +size 127785056 diff --git a/libreoffice.changes b/libreoffice.changes index 4b5ac50..c652c27 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 2 17:11:50 UTC 2015 - tchvatal@suse.com + +- Version bump to 4.4.2: + * 2nd bugfix update for the 4.4 series + ------------------------------------------------------------------- Mon Mar 30 14:31:03 UTC 2015 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index d3fdca6..a72fa41 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -23,10 +23,10 @@ %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.1 +%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.1.2 +Version: 4.4.2.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