Hello community, here is the log from the commit of package OpenOffice_org checked in at Mon Aug 20 18:53:48 CEST 2007. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2007-08-17 19:00:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2007-08-20 17:52:19.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 20 17:51:02 CEST 2007 - pmladek@suse.cz + +- fixed build dependencies of the desktop module + +------------------------------------------------------------------- Old: ---- minmem New: ---- ooo-build-oog680-m1-desktop-build-deps.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-i18n.spec ++++++ --- /var/tmp/diff_new_pack.gD3230/_old 2007-08-20 18:52:19.000000000 +0200 +++ /var/tmp/diff_new_pack.gD3230/_new 2007-08-20 18:52:19.000000000 +0200 @@ -85,7 +85,7 @@ License: GPL v2 or later, LGPL v2 or later, The non-standard licenses from /usr/lib/ooo-2.0/THIRDPARTYLICENSEREADME.html: Group: Productivity/Office/Suite Version: 2.3.0.0.1 -Release: 1 +Release: 2 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.gD3230/_old 2007-08-20 18:52:19.000000000 +0200 +++ /var/tmp/diff_new_pack.gD3230/_new 2007-08-20 18:52:19.000000000 +0200 @@ -126,7 +126,7 @@ License: Artistic License, BSD 3-Clause, The non-standard licenses from /usr/lib/ooo-2.0/THIRDPARTYLICENSEREADME.html: Group: Productivity/Office/Suite Version: 2.3.0.0.1 -Release: 1 +Release: 3 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -250,6 +250,7 @@ Patch1: ooo-build-help.diff Patch2: ooo-build-pack-noarch.diff Patch3: ooo-build-oog680-m1-cws-compatability01.diff +Patch4: ooo-build-oog680-m1-desktop-build-deps.diff Patch100: extra_localizations_sources-about.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -617,6 +618,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 install -m 644 %{S:1} %{S:2} %{S:3} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} %{S:19} %{S:20} src/ %if %suse_version <= 1010 # FIXME: the current OOo version does not longer work with the old neon, so @@ -1028,6 +1030,8 @@ %{_prefix}/bin/dmake %changelog +* Mon Aug 20 2007 - pmladek@suse.cz +- fixed build dependencies of the desktop module * Fri Aug 17 2007 - pmladek@suse.cz - updated to milestone oog680-m1 (another OOo-2.3.beta, close rc1) - updated ooo-build to oog680-m1: ++++++ ooo-build-oog680-m1-desktop-build-deps.diff ++++++ Index: ooo-build/patches/src680/speed-ooqstart-intros2.diff =================================================================== --- ooo-build/patches/src680/speed-ooqstart-intros2.diff (revision 10096) +++ ooo-build/patches/src680/speed-ooqstart-intros2.diff (working copy) @@ -11,20 +11,29 @@ --- desktop/unx/source/makefile.mk 2007-08-10 14:48:09.000000000 +0200 +++ desktop/unx/source/makefile.mk 2007-08-10 15:11:48.000000000 +0200 -@@ -10,7 +10,6 @@ PKGCONFIG_MODULES=glib-2.0 +@@ -10,11 +10,14 @@ PKGCONFIG_MODULES=glib-2.0 .INCLUDE: pkg_config.mk CFLAGS += $(PKGCONFIG_CFLAGS) -CFLAGS += -DINTRO_BITMAP_NAMES=\"$(INTRO_BITMAP_NAMES)\" STDLIB= ++OBJFILES= \ ++ $(OBJ)$/splashx.obj \ ++ $(OBJ)$/start.obj ++ APP1TARGET = $(TARGET) -@@ -23,3 +22,15 @@ APP1STDLIBS = $(PKGCONFIG_LIBS) -lX11 -l +-APP1OBJS = $(OBJ)$/splashx.obj $(OBJ)$/start.obj ++APP1OBJS = $(OBJFILES) + APP1NOSAL = TRUE + APP1LIBSALCPPRT= + APP1CODETYPE = C +@@ -23,3 +26,15 @@ APP1STDLIBS = $(PKGCONFIG_LIBS) -lX11 -l # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + -+$(SLO)$/start.obj : $(INCCOM)$/introbmpnames.hxx ++$(OBJ)$/start.obj : $(INCCOM)$/introbmpnames.hxx + +.INCLUDE .IGNORE : $(MISC)$/intro_bmp_names.mk + Index: ooo-build/patches/src680/hack_ooqstart-glib.diff =================================================================== --- ooo-build/patches/src680/hack_ooqstart-glib.diff (revision 10096) +++ ooo-build/patches/src680/hack_ooqstart-glib.diff (working copy) @@ -26,7 +26,7 @@ PKGCONFIG_MODULES=glib-2.0 .INCLUDE: pkg_config.mk -@@ -26,8 +20,6 @@ +@@ -29,8 +23,6 @@ APP1CODETYPE = C APP1STDLIBS = $(PKGCONFIG_LIBS) -lX11 -lsal$(DLLPOSTFIX) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org