Hello community, here is the log from the commit of package OpenOffice_org-libs-core checked in at Mon Sep 29 18:11:01 CEST 2008. -------- --- OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2008-09-11 23:07:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2008-09-27 17:39:39.000000000 +0200 @@ -1,0 +2,17 @@ +Sat Sep 27 12:04:54 CEST 2008 - pmladek@suse.cz + +- updated to the milestone ooo300-m7 (3.0rc2) +- updated ooo-build to version 3.0.0.5 +- added base-drivers-postgresql subpackage (fate#304558) +- added postgresql-devel to BuildRequires +- added Requires OpenOffice_org = %version +- added Supplements OpenOffice_org +- added libs-gui sources as a temporary hack + +------------------------------------------------------------------- +Sat Sep 27 12:04:54 CEST 2008 - pmladek@suse.cz + +- updated to the milestone ooo300-m7 (3.0rc2) +- updated ooo-build to version 3.0.0.5 + +------------------------------------------------------------------- Old: ---- ooo300-m5-libs_core.tar.bz2 New: ---- ooo300-m7-libs_core.tar.bz2 ooo300-m7-libs_gui.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-core.spec ++++++ --- /var/tmp/diff_new_pack.qJ1096/_old 2008-09-29 18:10:53.000000000 +0200 +++ /var/tmp/diff_new_pack.qJ1096/_new 2008-09-29 18:10:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-core (Version 3.0.0.4) +# spec file for package OpenOffice_org-libs-core (Version 3.0.0.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,15 @@ Name: OpenOffice_org-libs-core -Version: 3.0.0.4 +Version: 3.0.0.5 Release: 1 -%define ooo_build_version 3.0.0.4 +%define ooo_build_version 3.0.0.5 %define piece libs_core +# version of the postgresql driver +%define postgresql_version 0.7.5 BuildRequires: OpenOffice_org-libs-gui-devel = %version 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: postgresql-devel %if %suse_version > 1100 # libexpat-devel is explicitely needed since openSUSE-11.1 BuildRequires: libexpat-devel @@ -39,52 +42,21 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo300-m5 +%define ooo_build_tag ooo300-m7 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite AutoReqProv: on Requires: OpenOffice_org-libs-gui = %version -Summary: A Free Office Suite (Framework) +Summary: OpenOffice.org Core Libraries Url: http://www.openoffice.org/ Source: %ooo_build_tag-%piece.tar.bz2 +# FIXME: temporary solution until the layout headers are available in solver +Source1: %ooo_build_tag-libs_gui.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Openoffice.org is a comprehensive office package featuring a word -processor, a spreadsheet, a presentation program, and much more. This -package provides only the basic framework. You have to install the -additional modules to get the required functionality, see packages: - -- OpenOffice_org-base - -- OpenOffice_org-calc - -- OpenOffice_org-draw - -- OpenOffice_org-impress - -- OpenOffice_org-math - -- OpenOffice_org-writer - -Some optional features are provided by extra packages, for example: - -- OpenOffice_org-mailmerge - -- OpenOffice_org-filters - -- OpenOffice_org-kde - -- OpenOffice_org-gnome - -Non-English localizations are provided by extra packges as well, for -example: - -- OpenOffice_org-de - -- OpenOffice_org-fr - -- OpenOffice_org-it +This package provides core libraries used by all OpenOffice.org +modules. @@ -135,6 +107,19 @@ +%package -n OpenOffice_org-base-drivers-postgresql +License: LGPL v2.1 or later +Summary: PostgreSQL Database Driver for OpenOffice.org +Group: Productivity/Office/Suite +Requires: OpenOffice_org-base = %version +Requires: postgresql + +%description -n OpenOffice_org-base-drivers-postgresql +This package allows to access PostgreSQL databases from OpenOffice.org +Base. + + + %package devel Requires: %name = %version Requires: OpenOffice_org-ure-devel = %version @@ -152,18 +137,23 @@ %package l10n-prebuilt License: LGPL v3 only -Summary: A Source Package for OpenOffice.org Localizations +Summary: Prebuilt OpenOffice.org Core Libraries Localizations Group: Productivity/Office/Suite AutoReqProv: off %description l10n-prebuilt -This source package is used to build the OpenOffice.org artwork -development package. +This package includes the prebuilt localization of OpenOffice.org core +libraries. It is not intended for a real use. It needs to be repacked +to the real architecture independent package. + +This is only a temporary solution until we have an easier way to build +the OpenOffice.org localizations separately. %prep -%setup -q -n %ooo_build_tag-%piece +%setup -q -b1 -n %ooo_build_tag-%piece +mv ../%ooo_build_tag-libs_gui/toolkit . %build # setup env. @@ -188,6 +178,10 @@ "$DESTDIR/$OO_INSTDIR/basis-link" \ "$DESTDIR/$OO_INSTDIR/ure" \ "$DESTDIR/$OO_INSTDIR/basis3.0/program/services.rdb" +# FIXME: hack to install postgresql driver +mkdir -p $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install +cp connectivity/unxlng*.pro/lib/postgresql-sdbc-%postgresql_version.zip \ + $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extension/install %clean rm -rf $RPM_BUILD_ROOT @@ -202,6 +196,22 @@ %postun devel /sbin/ldconfig +%pre -n OpenOffice_org-base-drivers-postgresql +if test $1 = 2 ; then + echo "Unregistering the older PostgreSQL driver from OpenOffice.org..." + unopkg remove --shared org.openoffice.legacy.postgresql-sdbc-%postgresql_version.zip || true; +fi + +%post -n OpenOffice_org-base-drivers-postgresql +echo "Registering the PostgreSQL driver in OpenOffice.org..." +unopkg add --shared %ooo_prefix/%ooo_home/share/extension/install/postgresql-sdbc-%postgresql_version.zip || true; + +%preun -n OpenOffice_org-base-drivers-postgresql +if test $1 = 0 ; then + echo "Unregistering the PostgreSQL driver from OpenOffice.org..." + unopkg remove --shared org.openoffice.legacy.postgresql-sdbc-%postgresql_version.zip || true; +fi + %files -f files-%piece.txt %defattr(-,root,root) #%dir %ooo_prefix/%ooo_home/basis3.0 @@ -226,10 +236,28 @@ %files -f files-mailmerge.txt -n OpenOffice_org-mailmerge %defattr(-,root,root) +%files -n OpenOffice_org-base-drivers-postgresql +%defattr(-,root,root) +%dir %ooo_prefix/%ooo_home +%dir %ooo_prefix/%ooo_home/share +%dir %ooo_prefix/%ooo_home/share/extension +%dir %ooo_prefix/%ooo_home/share/extension/install +%ooo_prefix/%ooo_home/share/extension/install/postgresql-sdbc-%postgresql_version.zip + %files l10n-prebuilt %defattr(-,root,root) %ooo_prefix/%ooo_home/solver/noarch %changelog +* Sat Sep 27 2008 pmladek@suse.cz +- updated to the milestone ooo300-m7 (3.0rc2) +- updated ooo-build to version 3.0.0.5 +- added base-drivers-postgresql subpackage (fate#304558) +- added postgresql-devel to BuildRequires +- added Requires OpenOffice_org = %%version +- added Supplements OpenOffice_org +- added libs-gui sources as a temporary hack +- updated to the milestone ooo300-m7 (3.0rc2) +- updated ooo-build to version 3.0.0.5 * Thu Sep 11 2008 pmladek@suse.cz - split from the main OpenOffice_org package, version 3.0.0.4 ++++++ ooo300-m5-libs_core.tar.bz2 -> ooo300-m7-libs_core.tar.bz2 ++++++ OpenOffice_org-libs-core/ooo300-m5-libs_core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-core/ooo300-m7-libs_core.tar.bz2 differ: byte 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