commit OpenOffice_org-calc for openSUSE:Factory
Hello community, here is the log from the commit of package OpenOffice_org-calc for openSUSE:Factory checked in at Wed Sep 22 10:51:43 CEST 2010. -------- --- OpenOffice_org-calc/OpenOffice_org-calc.changes 2010-06-16 19:49:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-calc/OpenOffice_org-calc.changes 2010-09-15 21:59:50.000000000 +0200 @@ -1,0 +2,18 @@ +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 + +------------------------------------------------------------------- +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-calc.tar.bz2 New: ---- ooo-build-3.2.98.1-calc.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-calc.spec ++++++ --- /var/tmp/diff_new_pack.b7Vwmn/_old 2010-09-22 10:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.b7Vwmn/_new 2010-09-22 10:51:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-calc (Version 3.2.1.4) +# spec file for package OpenOffice_org-calc (Version 3.2.98.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,14 @@ Name: OpenOffice_org-calc -Version: 3.2.1.4 +Version: 3.2.98.1 Release: 1 -%define ooo_build_version 3.2.1.4 %define piece calc +%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 #!BuildIgnore: OpenOffice_org-filters-optional BuildRequires: OpenOffice_org-artwork-devel = %version @@ -39,9 +43,6 @@ BuildRequires: xorg-x11-proto-xproto BuildRequires: xorg-x11-utils %endif -%define ooo_prefix %_libdir -%define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on @@ -51,7 +52,7 @@ %endif Summary: OpenOffice.org Calc 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 @@ -93,9 +94,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. @@ -105,14 +104,14 @@ export PIECE_BUILD_NCPUS_AUTO=1 export PIECE_USE_JOBS="%{?jobs:%jobs}" # FIXME: temporary hack to avoid a dependecy problem -$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 %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 calc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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