commit OpenOffice_org-libs-extern for openSUSE:Factory
Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Mon Apr 26 22:39:42 CEST 2010. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-03-25 21:48:55.000000000 +0100 +++ OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-04-23 15:22:06.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) +- mysql connector extension stuff (fate#309243): + * added libmysqlclient-devel into BuildRequires + * added mysql-connector-cpp sources for openSUSE < 11.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-libs-extern-sys.tar.bz2 ooo320-m12-libs-extern.tar.bz2 New: ---- mysql-connector-cpp.zip ooo320-m15-libs-extern-sys.tar.bz2 ooo320-m15-libs-extern.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.kKwVhq/_old 2010-04-26 22:38:08.000000000 +0200 +++ /var/tmp/diff_new_pack.kKwVhq/_new 2010-04-26 22:38:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-extern (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-libs-extern (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,15 +21,17 @@ Name: OpenOffice_org-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %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: OpenOffice_org-bootstrap = %version BuildRequires: OpenOffice_org-ure-devel = %version +# mysql stuff +BuildRequires: libmysqlclient-devel # mozilla stuff %if %suse_version > 1110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel @@ -45,7 +47,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -63,8 +65,9 @@ %endif %if %suse_version == 1010 # prebuilt jsr allows to build OOo with Java 1.4 -Source90: jsr173_1.0_api.jar +Source60: jsr173_1.0_api.jar %endif +Source90: mysql-connector-cpp.zip # FIXME: hack the provides and requires (bnc#411538) # make sure external scripts are used %define _use_internal_dependency_generator 0 @@ -140,8 +143,10 @@ %endif # hacks needed for SLED10 %if %suse_version == 1010 -cp %{S:90} external/StAX +cp %{S:60} external/StAX %endif +# mysql stuff +cp %{S:90} mysqlcppconn/download %build # setup env. ++++++ ooo320-m12-libs-extern-sys.tar.bz2 -> ooo320-m15-libs-extern-sys.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo320-m12-libs-extern-sys.tar.bz2 OpenOffice_org-libs-extern/ooo320-m15-libs-extern-sys.tar.bz2 differ: char 11, line 1 ++++++ ooo320-m12-libs-extern.tar.bz2 -> ooo320-m15-libs-extern.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo320-m12-libs-extern.tar.bz2 OpenOffice_org-libs-extern/ooo320-m15-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
participants (1)
-
root@hilbert.suse.de