commit OpenOffice_org-base for openSUSE:Factory
Hello community, here is the log from the commit of package OpenOffice_org-base for openSUSE:Factory checked in at Wed Sep 22 10:52:16 CEST 2010. -------- --- OpenOffice_org-base/OpenOffice_org-base.changes 2010-06-16 19:49:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-base/OpenOffice_org-base.changes 2010-09-15 21:59:29.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Sep 15 20:45:27 CEST 2010 - pmladek@suse.cz + +- updated to version 3.2.98.1 (3.3-alpha1) +- used the prepatched OOo sources from ooo-build git +- added OpenOffice_org-testing into BuildRequires + +------------------------------------------------------------------- +Thu Sep 2 15:45:12 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.6 (3.2.1 security update, bnc#629085, + MaintenanceTracker-35044, CVE-2010-2935, CVE-2010-2936) + +------------------------------------------------------------------- +Tue Aug 24 16:37:41 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.5 (3.2.1 security update, bnc#629085, + MaintenanceTracker-35044, CVE-2010-2935, CVE-2010-2936) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m19-base.tar.bz2 New: ---- ooo-build-3.2.98.1-base.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-base.spec ++++++ --- /var/tmp/diff_new_pack.OVpOX2/_old 2010-09-22 10:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.OVpOX2/_new 2010-09-22 10:51:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-base (Version 3.2.1.4) +# spec file for package OpenOffice_org-base (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,14 @@ Name: OpenOffice_org-base -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece base +%define ooo_build_version 3.2.98.1 +%define ooo_piece_version 3.2.98.1 +%define ooo_sourcedirname ooo-build-%ooo_piece_version +%define ooo_prefix %_libdir +%define ooo_home ooo3 #!BuildIgnore: OpenOffice_org 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 libexif 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} @@ -34,12 +38,10 @@ BuildRequires: xorg-x11-proto-xproto BuildRequires: xorg-x11-utils %endif +BuildRequires: OpenOffice_org-testing = %version BuildRequires: OpenOffice_org-artwork-devel = %version BuildRequires: OpenOffice_org-components-devel = %version BuildRequires: OpenOffice_org-libs-core-devel = %version -%define ooo_prefix %_libdir -%define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on @@ -74,7 +76,7 @@ %endif Summary: OpenOffice.org Base Url: http://www.openoffice.org/ -Source0: %ooo_build_tag-%piece.tar.bz2 +Source0: ooo-build-%ooo_piece_version-%piece.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -117,9 +119,7 @@ %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +%setup -q -n ooo-build-%ooo_piece_version-%piece %build # setup env. @@ -129,14 +129,14 @@ export PIECE_BUILD_NCPUS_AUTO=1 export PIECE_USE_JOBS="%{?jobs:%jobs}" # call more times to pass a random build error -$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag || $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag || $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag || $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname || $OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname || $OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname || $OO_TOOLSDIR/piece/build-generic %piece %ooo_sourcedirname %install # setup env. export OO_INSTDIR=%{_libdir}/%ooo_home export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin export DESTDIR=$RPM_BUILD_ROOT -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag +$OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname %if 0%{?suse_version} %suse_update_desktop_file base %endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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