Hello community, here is the log from the commit of package libreoffice-ure for openSUSE:11.2 checked in at Thu Mar 31 01:30:40 CEST 2011. Wide character in print at /work/src/bin/tools/get_bugzilla line 45. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ 11.2/libreoffice-ure/libreoffice-ure.changes 2011-03-18 22:35:11.000000000 +0100 @@ -0,0 +1,453 @@ +------------------------------------------------------------------- +Fri Mar 18 22:12:32 CET 2011 - pmladek@suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia@mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Feb 23 14:08:35 CET 2011 - pmladek@suse.cz + +- libreoffice-3.3.1.2 == 3.3.1-rc2 == final + +------------------------------------------------------------------- +Wed Feb 16 16:27:04 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.1.2 (3.3.1-rc2) + +------------------------------------------------------------------- +Tue Feb 8 20:53:59 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.1.1 (3.3.1-rc1) + +------------------------------------------------------------------- +Tue Feb 1 21:14:19 CET 2011 - pmladek@suse.cz + +- added compat symlink %_datadir/ooo3/link-to-ooo-home to correctly + uninstall OOo + +------------------------------------------------------------------- +Mon Jan 31 20:32:38 CET 2011 - pmladek@suse.cz + +- libreoffice-build-3.3.0.4 == 3.3.0-rc4 == final + +------------------------------------------------------------------- +Wed Jan 19 12:58:21 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.4 (3.3-rc4) + +------------------------------------------------------------------- +Tue Jan 11 16:41:58 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.3 (3.3-rc3) + +------------------------------------------------------------------- +Tue Dec 21 19:44:02 CET 2010 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- +Wed Dec 1 19:41:47 CET 2010 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.1 (3.3-rc1) +- fixed URL, summary, and description for LibreOffice + +------------------------------------------------------------------- +Thu Nov 18 14:19:15 CET 2010 - pmladek@suse.cz + +- temporary disabled mono stuff in Factory; could not be built (bnc#653662) + +------------------------------------------------------------------- +Mon Nov 15 16:16:32 CET 2010 - pmladek@suse.cz + +- disabled KDE3 stuff on openSUSE >= 11.2 (bnc#605472, bnc#621472) +- added gcc-c++ and libxml2-devel into BuildRequires; were required + by kdelibs3-devel before + +------------------------------------------------------------------- +Fri Nov 12 12:24:42 CET 2010 - pmladek@suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3) + +------------------------------------------------------------------- +Thu Oct 14 19:12:31 CEST 2010 - pmladek@suse.cz + +- switched to the LibreOffice code base, http://www.documentfoundation.org/ +- renamed packages from OpenOffice_org* to libreoffice* +- updated to libreoffice-3.2.99.2 (3.3-beta2) + +------------------------------------------------------------------- +Fri Sep 17 17:22:17 CEST 2010 - pmladek@suse.cz + +- required libcppunit-devel only on openSUSE >= 11.0 + +------------------------------------------------------------------- +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 libcppunit-devel into BuildRequires +- updated the prebuilt cli dlls for PPC and SLED10 + +------------------------------------------------------------------- +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) + +------------------------------------------------------------------- +Wed Jun 16 19:17:34 CEST 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.1.4 (3.2.1 maintenance update) + +------------------------------------------------------------------- +Mon May 31 17:27:18 CEST 2010 - pmladek@suse.cz + +- ooo-build-3.2.1.3 == 3.2.1-rc3 == final + +------------------------------------------------------------------- +Fri May 28 17:37:09 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m19 +- updated ooo-build to version 3.2.1.3 (3.2.1-rc3) + +------------------------------------------------------------------- +Tue May 25 17:44:26 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m18 (3.2.1-rc2) +- updated ooo-build to version 3.2.1.2 (3.2.1-rc2) + +------------------------------------------------------------------- +Thu May 13 20:29:10 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m17 (3.2.1-rc1) +- updated ooo-build to version 3.2.1.1 (3.2.1-rc1) +- added initial support for build on MeeGo distro + +------------------------------------------------------------------- +Fri Apr 23 11:30:30 CEST 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) +- updated the prebuilt cli dlls for PPC and SLED10 + +------------------------------------------------------------------- +Thu Mar 25 21:38:09 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.99.2 (3.2.1-beta2) + +------------------------------------------------------------------- +Thu Mar 11 21:18:47 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.99.1 (3.2.1-beta1) +- used the new solution to control parallel build + +------------------------------------------------------------------- +Fri Feb 26 17:11:58 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.98.1 (3.2.1-alpha1) + +------------------------------------------------------------------- +Wed Feb 24 17:20:34 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.7 (3.2 bugfix release) + +------------------------------------------------------------------- +Thu Feb 18 20:46:24 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.6 (3.2 bugfix release) + +------------------------------------------------------------------- +Thu Feb 4 19:36:48 CET 2010 - pmladek@suse.cz + +- ooo-build-3.2.0.5 == 3.2-rc5 == final + +------------------------------------------------------------------- +Thu Feb 4 15:33:42 CET 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m12 (3.2-rc5) +- updated ooo-build to version 3.2.0.5 (3.2-rc5) + +------------------------------------------------------------------- +Wed Jan 27 20:29:22 CET 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m11 (3.2-rc4) +- updated ooo-build to version 3.2.0.4 (3.2-rc4) + +------------------------------------------------------------------- +Wed Jan 13 19:32:02 CET 2010 - pmladek@suse.cz + +- updated to the milestone ooo320-m9 +- updated ooo-build to version 3.2.0.2 (3.2-rc2) + +------------------------------------------------------------------- +Sun Dec 20 19:38:12 CET 2009 - pmladek@suse.cz + +- updated to the milestone ooo320-m8 +- updated ooo-build to version 3.2.0.1 (3.2-rc1) + ++++ 256 more lines (skipped) ++++ between /dev/null ++++ and 11.2/libreoffice-ure/libreoffice-ure.changes calling whatdependson for 11.2-i586 New: ---- 185d60944ea767075d27247c3162b3bc-unowinreg.dll libreoffice-3.2.99.2-piece-sdk-with-ure.diff libreoffice-sdk-3.3.1.2.tar.bz2 libreoffice-ure-3.3.1.2.tar.bz2 libreoffice-ure.changes libreoffice-ure.spec ooo-cli-prebuilt-3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-ure.spec ++++++ # # spec file for package libreoffice-ure # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libreoffice-ure Version: 3.3.1.2 Release: 2.<RELEASE2> %define piece ure %define ooo_build_version 3.3.1.2 %define ooo_piece_version 3.3.1.2 %define ooo_sourcedirname libreoffice-build-%ooo_build_version %define ooo_prefix %_libdir %define ooo_home libreoffice %define ooo_basis_dir basis3.3 #!BuildIgnore: libreoffice BuildRequires: libreoffice-bootstrap = %version BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libxml2-devel 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} BuildRequires: db-devel krb5 libexif openldap2-devel xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel libexif-devel openldap-devel BuildRequires: xorg-x11-server-devel BuildRequires: xorg-x11-proto-xproto BuildRequires: xorg-x11-utils %endif ############################ # KDE3 stuff %if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ # cppunit stuff %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on %if 0%{?suse_version} %ifarch %ix86 # libstlport_gcc4 improves compatibility with the upstream extensions (bnc#458952) Recommends: libstlport_gcc4 %endif %endif # compat stuff Provides: OpenOffice_org-ure = %version Obsoletes: OpenOffice_org-ure <= %version Summary: LibreOffice UNO Runtime Environment Url: http://www.documentfoundation.org/ Source0: libreoffice-%piece-%ooo_piece_version.tar.bz2 Source1: libreoffice-sdk-%ooo_piece_version.tar.bz2 # prebuilt mono dlls for older distributions and ppc Source100: ooo-cli-prebuilt-3.3.tar.bz2 # necessary for SDK, http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html # FIXME: can be built using mingw32 C++ compiler Source101: 185d60944ea767075d27247c3162b3bc-unowinreg.dll # FIXME: this patch is needed to build ure and sdk pieces at the same time Patch990: libreoffice-3.2.99.2-piece-sdk-with-ure.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc %description UNO is the basic technology used by LibreOffice. It allows to integrate modules written in various programming languages. %if 0%{?suse_version} <= 01130 %package -n libreoffice-mono License: LGPLv3 Summary: Mono UNO Bridge for LibreOffice Group: Productivity/Office/Suite Requires: mono-core Requires: %name = %version Provides: OpenOffice_org-mono = %version Obsoletes: OpenOffice_org-mono <= %version %description -n libreoffice-mono The Mono/UNO binding allows a Mono application to access the complete set of APIs exposed by LibreOffice via UNO. A trivial example use-case might be a small mono application to create a spreadsheet, populate it with data, charts, formatting, then save that in Excel format. Currently the use of Mono for add-ins & scripting inside OO.o itself is not supported. %endif %package -n libreoffice-pyuno License: LGPLv3 Summary: Python UNO Bridge for LibreOffice Group: Productivity/Office/Suite Provides: libreoffice:%ooo_prefix/%ooo_home/program/pyuno.so Requires: %name = %version # compat stuff Provides: OpenOffice_org-pyuno = %version Obsoletes: OpenOffice_org-pyuno <= %version %description -n libreoffice-pyuno The Python-UNO bridge allows to use the standard LibreOffice API from the well known Python scripting language. It can be used to develop UNO components in python, thus python UNO components may be run within the LibreOffice process and can be called from Java, C++ or the built in StarBasic scripting language. You can create and invoke scripts with the office scripting framework (OOo 2.0 and later) with it. For example, it is used for the mail merge functionality. You can find the more information at http://udk.openoffice.org/python/python-bridge.html %package devel Requires: %name = %version %if 0%{?suse_version} <= 01130 Requires: libreoffice-mono = %version %endif Requires: libreoffice-pyuno = %version Requires: libreoffice-bootstrap = %version # compat stuff Provides: OpenOffice_org-ure-devel = %version Obsoletes: OpenOffice_org-ure-devel <= %version Provides: OpenOffice_org-sdk = %version Obsoletes: OpenOffice_org-sdk <= %version Provides: libreoffice-sdk = %version License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Summary: LibreOffice URE Development Group: Productivity/Office/Suite AutoReqProv: off %description devel This package allows developement based on the LibreOffice UNO runtime environment API. %package devel-doc Requires: %name-devel = %version # compat stuff Provides: OpenOffice_org-ure-devel-doc = %version Obsoletes: OpenOffice_org-ure-devel-doc <= %version Provides: OpenOffice_org-sdk-doc = %version Obsoletes: OpenOffice_org-sdk-doc <= %version Provides: libreoffice-sdk-doc = %version License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Summary: LibreOffice URE Development Group: Productivity/Office/Suite AutoReqProv: off %description devel-doc This package allows developement based on the LibreOffice UNO runtime environment API. %prep %setup -q -b1 -n libreoffice-%piece-%ooo_piece_version # move sdk sources to the main build dir mv ../libreoffice-sdk-%ooo_piece_version/* . && rmdir ../libreoffice-sdk-%ooo_piece_version # prebuilt stuff mkdir -p external/cli tar -xjf %{S:100} -C external/cli mkdir -p ooo-build/src cp %{S:101} ooo-build/src # FIXME: create fake prj stuff to make build happy mkdir -p external/prj touch external/prj/build.lst touch external/prj/d.lst # hotfixes mkdir -p ooo-build/hotfixes cp %{P:990} ooo-build/hotfixes %build # setup env. export OO_INSTDIR=%{_libdir}/%ooo_home export OO_TOOLSDIR=$OO_INSTDIR/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_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/build/bin export DESTDIR=$RPM_BUILD_ROOT # install SDK first because it removes solver $OO_TOOLSDIR/piece/install-generic sdk %ooo_sourcedirname $OO_TOOLSDIR/piece/install-generic %piece %ooo_sourcedirname # bin the SDK-related zip files from solver; they were installed together with URE find $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/solver -name "*.zip" -exec rm -f {} \; %ifarch %ix86 # helper script to create compat link needed to run upstream extensions (bnc#458952) cat << EOF > $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links #!/bin/sh # helper script to create compat link needed to run upstream extensions (bnc#458952) if ! test -L %_libdir/libstlport_gcc.so -a -r %_libdir/libstlport_gcc.so ; then lib_name=\`ls /usr/lib/libstlport_gcc.so.4* 2>/dev/null | tail -n 1\` if test -n "\$lib_name" -a -r "\$lib_name" ; then lib_name=\`basename \$lib_name\` rm -f %_libdir/libstlport_gcc.so ln -sf \$lib_name %_libdir/libstlport_gcc.so fi fi EOF chmod 755 $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links %endif # compat symlink to correctly uninstall OOo mkdir -p $RPM_BUILD_ROOT%_datadir/ooo3 ln -sf ../libreoffice/link-to-ooo-home $RPM_BUILD_ROOT%_datadir/ooo3/link-to-ooo-home %clean rm -rf $RPM_BUILD_ROOT %pre # crazy hack for the ugly extensions if test $1 -gt 1 ; then if test -d %{_libdir}/%ooo_home/share/uno_packages/cache -a \ -n "`find %{_libdir}/%ooo_home/share/uno_packages/cache -name LanguageTool-0.9.3.oxt`" ; then # try to remove the LangTool extension by the older URE; it can't be # removed with OOo-3.1 and higher echo "Unregistering the LangTool extension from LibreOffice..." unopkg remove --shared org.openoffice.languagetool.oxt || true; # clear disk cache unopkg list --shared > /dev/null 2>&1 || true; fi fi %post /sbin/ldconfig # clean the UNO cache if there is a broken extension unopkg-regenerate-cache %{_libdir}/%ooo_home LanguageTool-0.9.3.oxt || true # FIXME: remove this in OOo-3.3; people should have cleaned system by the update # to OOo-3.2, OOo-3.2.1, or they do not care # an older version created invalid symlink /libstlport_gcc.so by mistake # we remove it because it looks quite ugly if test -L /libstlport_gcc.so ; then rm -f /libstlport_gcc.so fi %postun /sbin/ldconfig %ifarch %ix86 if test $1 = 0 ; then # OOo is removed => remove the link as well if it is not created by stlport-devel package (bnc#458952) if test -L %_libdir/libstlport_gcc.so -a ! -r %_prefix/include/stlport/ctime ; then rm -f %_libdir/libstlport_gcc.so fi fi %endif %ifarch %ix86 %posttrans # the compat link was %%ghost in old OOo-ure packages, so it might be removed also during OOo-ure update (bnc#458952) if test -f %ooo_prefix/%ooo_home/ure/bin/javaldx ; then %ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links || true; fi %endif %ifarch %ix86 %triggerin -- libstlport_gcc4 # create compat link needed to run upstream extensions (bnc#458952) %ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links || true; %endif %ifarch %ix86 %triggerpostun -- libstlport_gcc4-devel # create compat link needed to run upstream extensions (bnc#458952) %ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links || true; %endif %ifarch %ix86 %triggerpostun -- libstlport_gcc4 # remove compat link needed to run upstream extensions (bnc#458952) if test $2 = 0 ; then if test -L %_libdir/libstlport_gcc.so -a ! -r %_libdir/libstlport_gcc.so ; then rm -f %_libdir/libstlport_gcc.so fi fi exit 0 %endif %post devel /sbin/ldconfig %postun devel /sbin/ldconfig %files -f files-%piece.txt %defattr(-,root,root) %ifarch %ix86 %ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links %endif # compat symlink to correctly uninstall OOo %dir %_datadir/ooo3 %_datadir/ooo3/link-to-ooo-home %if 0%{?suse_version} <= 01130 %files -f files-mono.txt -n libreoffice-mono %defattr(-,root,root) %endif %files -f files-pyuno.txt -n libreoffice-pyuno %defattr(-,root,root) %if 0%{?meego_version} %ooo_prefix/%ooo_home/%ooo_basis_dir/program/*.pyc %ooo_prefix/%ooo_home/%ooo_basis_dir/program/*.pyo %endif %files -f files-sdk.txt devel %defattr(-,root,root) %dir %ooo_prefix/%ooo_home/solver %ooo_prefix/%ooo_home/solver/* %files -f files-sdk-doc.txt devel-doc %defattr(-,root,root) %changelog ++++++ libreoffice-3.2.99.2-piece-sdk-with-ure.diff ++++++ --- odk/util/makefile.pmk.old 2010-09-03 19:21:02.000000000 +0200 +++ odk/util/makefile.pmk 2010-09-03 19:28:18.000000000 +0200 @@ -58,11 +58,11 @@ DESTDIRGENCPPREF=$(DESTDIRDOCU)/cpp/ref DESTDIRJAVADOCU=$(DESTDIRDOCU)/java DESTDIRGENJAVAREF=$(DESTDIRDOCU)/java/ref -BINOUT=$(SOLARBINDIR) -INCOUT=$(SOLARINCDIR) -IDLOUT=$(SOLARIDLDIR) -XMLOUT=$(SOLARXMLDIR) -LIBOUT=$(SOLARLIBDIR) +BINOUT=$(SOLARPIECE)$/$(INPATH)$/bin +INCOUT=$(SOLARPIECE)$/$(INPATH)$/inc +IDLOUT=$(SOLARPIECE)$/$(INPATH)$/idl +XMLOUT=$(SOLARPIECE)$/$(INPATH)$/xml +LIBOUT=$(SOLARPIECE)$/$(INPATH)$/lib CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl CONVERTTAGFLAGNAME=converttags_html_files.flag @@ -190,7 +190,7 @@ INCLUDETOPDIRLIST= \ $(INCOUT)/cppuhelper \ $(INCOUT)/bridges \ $(INCOUT)/registry \ - $(INCOUT)/stl + $(SOLARINCDIR)$/stl .IF "$(GUI)"=="WNT" INCLUDETOPDIRLIST += $(INCOUT)/systools --- unodevtools/source/skeletonmaker/makefile.mk.old 2009-04-16 15:28:40.000000000 +0200 +++ unodevtools/source/skeletonmaker/makefile.mk 2009-04-16 15:39:07.000000000 +0200 @@ -51,8 +51,8 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \ $(OBJ)$/javacompskeleton.obj \ $(OBJ)$/cppcompskeleton.obj -APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \ - $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN) +APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARPIECE)$/$(INPATH)$/lib$/$(CODEMAKERLIBDEPN) \ + $(SOLARPIECE)$/$(INPATH)$/lib$/$(COMMONCPPLIBDEPN) $(SOLARPIECE)$/$(INPATH)$/lib$/$(COMMONJAVALIBDEPN) APP1STDLIBS =\ $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)\ $(REGLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB) --- odk/source/unoapploader/unx/makefile.mk.old 2009-04-02 12:54:49.000000000 +0200 +++ odk/source/unoapploader/unx/makefile.mk 2009-04-16 15:50:34.000000000 +0200 @@ -57,7 +57,7 @@ APP1RPATH=NONE APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj +APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARPIECE)$/$(INPATH)$/lib$/findsofficepath.obj # --- Targets ------------------------------------------------------ --- odk/pack/gendocu/makefile.mk.old 2009-04-16 15:28:52.000000000 +0200 +++ odk/pack/gendocu/makefile.mk 2009-04-16 16:00:08.000000000 +0200 @@ -107,7 +107,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEA -rm $(@:d:d)$/cpp.css $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css -$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f) +$(JAVA_SRC_FILES) : $(SOLARPIECE)$/$(INPATH)$/bin$/$$(@:f) -$(MKDIRHIER) $(@:d) $(MY_COPY) $< $@ cd $(JAVA_SRC_DIR) && unzip -quo $(@:f) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org