Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Tue May 18 00:15:06 CEST 2010. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-04-29 20:38:14.000000000 +0200 +++ OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-05-13 21:45:52.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 13 20:29:10 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m17 (3.2.1-rc1) +- updated ooo-build to version 3.2.1.1 (3.2.1-rc1) +- added initial support for build on MeeGo distro +- added the separated mdds source tarball, version 0.3.0 +- added hack to hide the internal libmysqlcppconn.so in provides and requires + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mysqlcppconn-static-mysql-binding.diff ooo320-m15-libs-extern-sys.tar.bz2 ooo320-m15-libs-extern.tar.bz2 New: ---- mdds_0.3.0.tar.bz2 ooo320-m17-libs-extern-sys.tar.bz2 ooo320-m17-libs-extern.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.Xp8N1P/_old 2010-05-18 00:14:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Xp8N1P/_new 2010-05-18 00:14:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-extern (Version 3.2.0.99.3) +# spec file for package OpenOffice_org-libs-extern (Version 3.2.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,36 +21,51 @@ Name: OpenOffice_org-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.2.0.99.3 -Release: 2 -%define ooo_build_version 3.2.0.99.3 +Version: 3.2.1.1 +Release: 1 +%define ooo_build_version 3.2.1.1 %define piece libs-extern #!BuildIgnore: OpenOffice_org # urg, ure dep is now required for cppunit ... -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip +BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +%if 0%{?suse_version} +BuildRequires: db-devel kdelibs3-devel krb5 libexif openldap2-devel xorg-x11 +%endif +%if 0%{?meego_version} +BuildRequires: db4-devel krb5-devel libexif-devel openldap-devel +BuildRequires: xorg-x11-server-devel +BuildRequires: xorg-x11-proto-xproto +BuildRequires: xorg-x11-utils +%endif BuildRequires: OpenOffice_org-bootstrap = %version BuildRequires: OpenOffice_org-ure-devel = %version + +############################ # mysql stuff -%if %suse_version <= 1210 +%if 0%{?suse_version} && 0%{?suse_version} <= 01210 # mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlclient-devel %endif +############################ # mozilla stuff -%if %suse_version > 1110 || %use_xulrunner191 == yes +%if 0%{?suse_version} > 01110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel %endif -%if %suse_version > 1100 && %suse_version <= 1110 && %use_xulrunner191 != yes +%if 0%{?suse_version} > 01100 && 0%{?suse_version} <= 01110 && %use_xulrunner191 != yes BuildRequires: mozilla-xulrunner190-devel %endif -%if %suse_version > 1010 && %suse_version <= 1100 +%if 0%{?suse_version} > 01010 && 0%{?suse_version} <= 01100 BuildRequires: mozilla-xulrunner181-devel %endif -%if %suse_version > 1000 && %suse_version <= 1010 +%if 0%{?suse_version} > 01000 && 0%{?suse_version} <= 01010 BuildRequires: gecko-sdk mozilla-xulrunner %endif +%if 0%{?meego_version} +BuildRequires: xulrunner-devel +%endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m15 +%define ooo_build_tag ooo320-m17 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -58,7 +73,7 @@ Url: http://www.openoffice.org/ Source: %ooo_build_tag-%piece.tar.bz2 Source1: %ooo_build_tag-%piece-sys.tar.bz2 -%if %suse_version <= 1030 +%if 0%{?suse_version} && 0%{?suse_version} <= 01030 # libwpd-0.8.11 with lots fixes Source50: libwpd-0.8.14.tar.gz # library that handles Word Perfect Draw documents @@ -66,11 +81,13 @@ # library that handles Microsoft Works documents Source52: libwps-0.1.2.tar.gz %endif -%if %suse_version == 1010 +%if 0%{?suse_version} == 01010 # prebuilt jsr allows to build OOo with Java 1.4 Source60: jsr173_1.0_api.jar %endif Source90: mysql-connector-cpp.zip +# Multi-Dimensional Data Structure +Source91: mdds_0.3.0.tar.bz2 # FIXME: hack the provides and requires (bnc#411538) # make sure external scripts are used %define _use_internal_dependency_generator 0 @@ -78,7 +95,6 @@ %define __find_requires /bin/sh %_sourcedir/ooo-libs-extern-req %name Source100: ooo-libs-extern-prov Source101: ooo-libs-extern-req -Patch1000: mysqlcppconn-static-mysql-binding.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -131,12 +147,12 @@ mv ooo-build/ooo/*/saxon . mv ooo-build/ooo/*/graphite . # hacks needed until 11.0 -%if %suse_version <= 1100 +%if 0%{?suse_version} && 0%{?suse_version} <= 01100 mv ooo-build/ooo/*/boost . mv ooo-build/ooo/*/icu . %endif # hacks needed until 10.3 -%if %suse_version <= 1030 +%if 0%{?suse_version} && 0%{?suse_version} <= 01030 mv ooo-build/ooo/*/hunspell . mkdir -p libwpd/download mkdir -p libwpg/download @@ -146,14 +162,20 @@ cp %{S:52} libwps/download %endif # hacks needed for SLED10 -%if %suse_version == 1010 +%if 0%{?suse_version} == 01010 cp %{S:60} external/StAX %endif # mysql stuff -cp %{S:90} mysqlcppconn/download -# -mkdir -p ooo-build/hotfixes -cp %{P:1000} ooo-build/hotfixes +%if 0%{?suse_version} > 01210 || 0%{?meego_version} + # we do not want to build mysqlcppconn on some distros + mkdir -p ooo-build/ooo/do-not-build + mv mysqlcppconn ooo-build/ooo/do-not-build +%else + cp %{S:90} mysqlcppconn/download +%endif +# Multi-Dimensional Data Structure +mkdir -p mdds/download +cp %{S:91} mdds/download %build # setup env. ++++++ ooo-libs-extern-prov ++++++ --- /var/tmp/diff_new_pack.Xp8N1P/_old 2010-05-18 00:14:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Xp8N1P/_new 2010-05-18 00:14:00.000000000 +0200 @@ -2,4 +2,5 @@ grep -v -e libraptor.so \ -e librasqal.so \ -e librdf.so \ + -e libmysqlcppconn.so \ | /usr/lib/rpm/find-provides “$@” ++++++ ooo-libs-extern-req ++++++ --- /var/tmp/diff_new_pack.Xp8N1P/_old 2010-05-18 00:14:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Xp8N1P/_new 2010-05-18 00:14:00.000000000 +0200 @@ -2,4 +2,5 @@ /usr/lib/rpm/find-requires “$@” | \ grep -v -e libraptor.so \ -e librasqal.so \ - -e librdf.so + -e librdf.so \ + -e libmysqlcppconn.so \ ++++++ ooo320-m15-libs-extern-sys.tar.bz2 -> ooo320-m17-libs-extern-sys.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo320-m15-libs-extern-sys.tar.bz2 OpenOffice_org-libs-extern/ooo320-m17-libs-extern-sys.tar.bz2 differ: char 11, line 1 ++++++ ooo320-m15-libs-extern.tar.bz2 -> ooo320-m17-libs-extern.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo320-m15-libs-extern.tar.bz2 OpenOffice_org-libs-extern/ooo320-m17-libs-extern.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org