Hello community, here is the log from the commit of package OpenOffice_org for openSUSE:11.3 checked in at Thu Mar 31 00:45:11 CEST 2011. -------- --- old-versions/11.3/all/OpenOffice_org/OpenOffice_org.changes 2010-06-17 12:10:24.000000000 +0200 +++ 11.3/OpenOffice_org/OpenOffice_org.changes 2011-03-18 22:40:14.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 18 22:12:32 CET 2011 - pmladek@suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Fri Mar 18 09:40:30 CET 2011 - ro@suse.de + +- specfile tweak to fix build (insert empty build section) + +------------------------------------------------------------------- +Fri Mar 11 16:11:18 CET 2011 - dmueller@suse.de + +- switch to libreoffice + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/OpenOffice_org Destination is old-versions/11.3/UPDATES/all/OpenOffice_org calling whatdependson for 11.3-i586 Old: ---- minmem needed_space_in_mb ooo320-m19-postprocess.tar.bz2 New: ---- README ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.uPp3UA/_old 2011-03-31 00:45:05.000000000 +0200 +++ /var/tmp/diff_new_pack.uPp3UA/_new 2011-03-31 00:45:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package OpenOffice_org (Version 3.2.1.4) +# spec file for package OpenOffice_org # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,183 +19,16 @@ Name: OpenOffice_org -# allow to use xulrunner191 on SLED11-SP1 (bnc#540726) -%define use_xulrunner191 no -Version: 3.2.1.4 -Release: 1 -%define ooo_build_version 3.2.1.4 -%define piece postprocess -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 postgresql-devel python-devel recode unixODBC-devel unzip xml-commons-apis zip -############################ -# basic stuff -%if 0%{?suse_version} -BuildRequires: db-devel kdelibs3-devel krb5 openldap2-devel python-xml update-desktop-files xorg-x11 -%endif -%if 0%{?meego_version} -BuildRequires: db4-devel krb5-devel openldap-devel -BuildRequires: xorg-x11-server-devel -BuildRequires: xorg-x11-proto-xproto -BuildRequires: xorg-x11-utils -%endif -############################ -# mozilla stuff -%if 0%{?suse_version} > 01110 || %use_xulrunner191 == yes -BuildRequires: mozilla-xulrunner191-devel -%endif -%if 0%{?suse_version} > 01100 && 0%{?suse_version} <= 01110 && %use_xulrunner191 != yes -BuildRequires: mozilla-xulrunner190-devel -%endif -%if 0%{?suse_version} > 01010 && 0%{?suse_version} <= 01100 -BuildRequires: mozilla-xulrunner181-devel -%endif -%if 0%{?suse_version} > 01000 && 0%{?suse_version} <= 01010 -BuildRequires: gecko-sdk mozilla-xulrunner -%endif -%if 0%{?meego_version} -BuildRequires: xulrunner-devel -%endif -############################ -# expat stuff -%if 0%{?suse_version} > 01100 -# libexpat-devel is explicitely needed since openSUSE-11.1 -BuildRequires: libexpat-devel -%endif -%if 0%{?meego_version} -BuildRequires: expat-devel -%endif -############################ -# poppler is needed to build the PDF import extension -# the needed version 0.8.0 has been avaiable only since openSUSE-11.0 -%if 0%{?suse_version} >= 01100 -BuildRequires: libpoppler-devel -%endif -%if 0%{?meego_version} -BuildRequires: poppler-devel -%endif -############################ -# openSUSE 10.3 features -%if 0%{?suse_version} > 01020 || 0%{?meego_version} -BuildRequires: libicu-devel -%endif -############################ -# openSUSE 11.0 features -%if 0%{?suse_version} > 01030 || 0%{?meego_version} -BuildRequires: hunspell-devel libwpd-devel libwpg-devel libwps-devel -%endif -############################ -# CODE10 features -############################ -%if 0%{?suse_version} > 01000 -BuildRequires: gstreamer010-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis -%endif -%if 0%{?meego_version} -BuildRequires: gst-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis -%endif -#!BuildIgnore: OpenOffice_org -BuildRequires: OpenOffice_org-branding-upstream >= 3.2.0.99.3 -BuildRequires: OpenOffice_org-artwork-devel = %version -BuildRequires: OpenOffice_org-base-devel = %version -BuildRequires: OpenOffice_org-bootstrap = %version -BuildRequires: OpenOffice_org-calc-devel = %version -BuildRequires: OpenOffice_org-components-devel = %version -BuildRequires: OpenOffice_org-impress-devel = %version -BuildRequires: OpenOffice_org-filters-devel = %version -BuildRequires: OpenOffice_org-help-en-US-devel = %version -#BuildRequires: OpenOffice_org-l10n-devel = %version -BuildRequires: OpenOffice_org-libs-core-devel = %version -BuildRequires: OpenOffice_org-libs-extern-devel = %version -BuildRequires: OpenOffice_org-libs-gui-devel = %version -BuildRequires: OpenOffice_org-ure-devel = %version -BuildRequires: OpenOffice_org-writer-devel = %version -BuildRequires: OpenOffice_org-filters-devel = %version -%define ooo_prefix %_libdir -%define ooo_home ooo3 -%define ooo_build_tag ooo320-m19 -License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT -Group: Productivity/Office/Suite -AutoReqProv: on -Requires: OpenOffice_org-ure = %version -Requires: OpenOffice_org-components = %version -Requires: OpenOffice_org-filters = %version -Requires: OpenOffice_org-icon-themes = %version -Requires: OpenOffice_org-libs-core = %version -Requires: OpenOffice_org-libs-extern = %version -Requires: OpenOffice_org-libs-gui = %version -Requires: OpenOffice_org-l10n-extras = %version -Requires: OpenOffice_org-branding >= 3.2.0.99.3 -Requires: OpenOffice_org-branding < 4 -%if 0%{?suse_version} > 01000 -Recommends: OpenOffice_org-base -Recommends: OpenOffice_org-calc -Recommends: OpenOffice_org-draw -Recommends: OpenOffice_org-math -Recommends: OpenOffice_org-impress -Recommends: OpenOffice_org-writer -Recommends: OpenOffice_org-filters -Recommends: OpenOffice_org-mailmerge -Recommends: OpenOffice_org-hyphen -Recommends: OpenOffice_org-thesaurus-en -Recommends: OpenOffice_org-help-en-US -%endif -# compatibility with the older split build used in the Build Service (bnc#471280) -# the l10n package was available only for a short time -# during the 11.1 alpha phase -Provides: OpenOffice_org-l10n-en-US = %version -Obsoletes: OpenOffice_org-l10n-en-US <= %version -# some other compat suff -Provides: OpenOffice_org17 -Obsoletes: OpenOffice_org17 -Provides: OpenOffice_org-en OpenOffice_org-en-help OpenOffice_org2 -Obsoletes: OpenOffice_org-en OpenOffice_org-en-help OpenOffice_org2 -Provides: OpenOffice_org-hunspell OpenOffice_org2-hunspell -Obsoletes: OpenOffice_org-hunspell OpenOffice_org2-hunspell -# we need a JRE for oobase and the other stuff -%if 0%{?suse_version} -# gij is enough on SL 10.1 and higher -%if 0%{?suse_version} > 01000 -# --- -%ifarch %ix86 -# the 32-bit build requires 32-bit JRE, #222708 -Recommends: jre-32 >= 1.6 -%endif -# --- -%ifarch x86_64 -%if 0%{?suse_version} > 01020 -Recommends: jre-64 >= 1.6 -%endif -# the 64-bit build does not work with Sun Java on older distributions, #219982 -%if 0%{?suse_version} == 01020 -Requires: gcc-gij -%endif -%if 0%{?suse_version} && 0%{?suse_version} < 01020 -Requires: libgcj -%endif -%endif -# --- -%ifarch ppc -%if 0%{?suse_version} > 01020 -Recommends: jre-32 >= 1.6 -%endif -# there were problems with the commercial Java on ppc on older distribtions -%if 0%{?suse_version} == 01020 -Requires: gcc-gij -%endif -%if 0%{?suse_version} && 0%{?suse_version} < 01020 -Requires: libgcj -%endif -%endif -%endif -%endif -%if 0%{?meego_version} -Requires: jre >= 1.5 -%endif -# --- -Requires: xalan-j2 xerces-j2 xml-commons-apis +Version: 3.3.1.2.1 +Release: 0.<RELEASE2> Summary: A Free Office Suite (Framework) Url: http://www.openoffice.org/ -Source: %ooo_build_tag-%piece.tar.bz2 +Source0: README BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 ppc +ExclusiveArch: %ix86 x86_64 +Requires: libreoffice >= 3.3.1.2 +Group: Productivity/Office/Suite +License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT %description Openoffice.org is a comprehensive office package featuring a word @@ -236,106 +69,20 @@ -%package icon-themes-prebuilt -License: LGPLv2.0 ; LGPLv3 -Summary: Prebuilt OpenOffice.org Icon Themes -Group: Development/Sources -AutoReqProv: off - -%description icon-themes-prebuilt -This package includes the prebuilt OpenOffice.org Icon Themes. It is -not intended for real use. It needs to be repacked to the real -architecture independent package. - -This is only temporary solution to get an installable set of -OpenOffice.org packages for a new version as fast as possible. The -architecture independent package will be built from the original -sources in the future. - - - %prep -%setup -c -q -n %ooo_build_tag-%piece -# hack to move sources to a reasonable location -mv ooo/*/* . && rm -rf ooo +cp %{S:0} . %build -# setup env. -export OO_INSTDIR=%{_libdir}/%ooo_home -export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin -export VERBOSE=1 -export PIECE_BUILD_NCPUS_AUTO=1 -export PIECE_USE_JOBS="%{?jobs:%jobs}" -# FIXME: hack to avoid 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 +true %install -# setup env. -export OO_INSTDIR=%{_libdir}/%ooo_home -export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin -export DESTDIR=$RPM_BUILD_ROOT -export OO_ALLOW_PROFILES=1 -$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag -%if 0%{?suse_version} -%suse_update_desktop_file startcenter -%suse_update_desktop_file template -%endif +true %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig -/usr/bin/update-mime-database /usr/share/mime >/dev/null || true -%if 0%{?suse_version} -# update GNOME icon caches -SuSEconfig --module gtk2 || true -%endif -# -# /usr/bin/ooffice symlink is necessary by java UNO components to find the UNO -# installation using $PATH, see -# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html -# this scriptlet supports parallel installation of more OOo instances -soffice_symlink="/usr/bin/soffice" -default_wrapper="%ooo_prefix/%ooo_home/program/soffice" -if test -x "$default_wrapper" ; then - # this package installs the preferred OOo wrappers => it is getting to be the default OOo => remove od symlink - test -L "$soffice_symlink" && rm -f "$soffice_symlink" || true - test -e "$soffice_symlink" || ln -sf "$default_wrapper" "$soffice_symlink" || true -fi - -%preun -test "$1" = "0" && rm -rf ./%ooo_prefix/%ooo_home/share/uno_packages/cache || true - -%postun -/sbin/ldconfig -/usr/bin/update-mime-database /usr/share/mime >/dev/null || true -%if 0%{?suse_version} -# update GNOME icon caches -SuSEconfig --module gtk2 || true -%endif -# -# /usr/bin/ooffice symlink is necessary by java UNO components to find the UNO -# installation using $PATH, see -# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html -# this scriptlet supports parallel installation of more OOo instances -soffice_symlink="/usr/bin/soffice" -# the current package has been removed; try to find any other OOo installation -default_wrapper="`ls /usr/lib*/ooo*/program/soffice 2>/dev/null | head -n 1`" -test -L "$soffice_symlink" -a ! -r "$soffice_symlink" && rm -f "$soffice_symlink" || true -test -x "$default_wrapper" -a ! -e "$soffice_symlink" && ln -sf "$default_wrapper" "$soffice_symlink" || true -# FIXME: just to make lint check happy - -%triggerin -- mysql-connector-java -%ooo_prefix/%ooo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true - -%triggerpostun -- mysql-connector-java -%ooo_prefix/%ooo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true - -%files -f files-%piece.txt -%defattr(-,root,root) - -%files -f files-icon-themes.txt icon-themes-prebuilt +%files %defattr(-,root,root) +%doc README %changelog ++++++ README ++++++ OpenOffice.org has been replaced with LibreOffice. If you perform an upgrade, manual interaction is needed, otherwise you will stay with the old OpenOffice.org packages. Future updates will only be prepared and published for LibreOffice. Some parts of the documentation packages still mention 'OpenOffice.org'. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org