Hello community, here is the log from the commit of package OpenOffice_org-ure for openSUSE:Factory checked in at Wed May 6 18:57:34 CEST 2009. -------- --- OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-04-24 13:58:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-04-30 23:09:46.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek@suse.cz + +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m10-sdk.tar.bz2 ooo310-m10-ure.tar.bz2 New: ---- ooo310-m11-sdk.tar.bz2 ooo310-m11-ure.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-ure.spec ++++++ --- /var/tmp/diff_new_pack.c32598/_old 2009-05-06 18:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.c32598/_new 2009-05-06 18:57:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-ure (Version 3.0.99.6) +# spec file for package OpenOffice_org-ure (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: OpenOffice_org-ure -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 %define piece ure #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-bootstrap = %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 %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m10 +%define ooo_build_tag ooo310-m11 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 @@ -211,6 +211,9 @@ %defattr(-,root,root) %changelog +* Thu Apr 30 2009 pmladek@suse.cz +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) * Fri Apr 24 2009 pmladek@suse.cz - updated to the milestone ooo310-m10 - updated ooo-build to version 3.0.99.6 (3.1-beta6) ++++++ ooo310-m10-sdk.tar.bz2 -> ooo310-m11-sdk.tar.bz2 ++++++ ++++++ ooo310-m10-ure.tar.bz2 -> ooo310-m11-ure.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/prj/d.lst new/ooo310-m11-ure/pyuno/prj/d.lst --- old/ooo310-m10-ure/pyuno/prj/d.lst 2008-06-09 15:05:22.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/prj/d.lst 2009-04-22 16:54:40.000000000 +0200 @@ -15,7 +15,7 @@ ..\%__SRC%\bin\pythonloader.py %_DEST%\bin%_EXT%\pyuno\pythonloader.py ..\%__SRC%\bin\uno.py %_DEST%\bin%_EXT%\pyuno\uno.py ..\%__SRC%\bin\pyuno_services.rdb %_DEST%\bin%_EXT%\pyuno_services.rdb -..\%__SRC%\bin\pyuno.dll %_DEST%\bin%_EXT%\pyuno.dll +..\%__SRC%\bin\pyuno.pyd %_DEST%\bin%_EXT%\pyuno.pyd ..\%__SRC%\bin\pythonl*.dll %_DEST%\bin%_EXT%\pythonl*.dll ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/makefile.mk new/ooo310-m11-ure/pyuno/source/module/makefile.mk --- old/ooo310-m10-ure/pyuno/source/module/makefile.mk 2008-04-11 12:31:24.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/makefile.mk 2009-04-22 16:54:40.000000000 +0200 @@ -59,6 +59,7 @@ .ELSE .INCLUDE : pyversion.mk PYUNORC=pyuno.ini +DLLPOST=.pyd .ENDIF .IF "$(SYSTEM_PYTHON)" == "YES" @@ -108,11 +109,23 @@ # --- Targets ------------------------------------------------------ +.IF "$(GUI)$(COM)"=="WNTGCC" +ALLTAR : \ + $(DLLDEST)$/uno.py \ + $(DLLDEST)$/unohelper.py \ + $(PYUNO_MODULE) \ + $(MISC)$/$(PYUNORC) \ + $(LB)$/lib$(TARGET).a + +$(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def + dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a +.ELSE ALLTAR : \ $(DLLDEST)$/uno.py \ $(DLLDEST)$/unohelper.py \ $(PYUNO_MODULE) \ $(MISC)$/$(PYUNORC) +.ENDIF .INCLUDE : target.mk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/pyuno_callable.cxx new/ooo310-m11-ure/pyuno/source/module/pyuno_callable.cxx --- old/ooo310-m10-ure/pyuno/source/module/pyuno_callable.cxx 2008-04-11 12:33:22.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/pyuno_callable.cxx 2009-04-22 16:54:40.000000000 +0200 @@ -245,6 +245,9 @@ NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; PyRef PyUNO_callable_new ( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/pyuno.cxx new/ooo310-m11-ure/pyuno/source/module/pyuno.cxx --- old/ooo310-m10-ure/pyuno/source/module/pyuno.cxx 2008-04-11 12:32:21.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/pyuno.cxx 2009-04-22 16:54:40.000000000 +0200 @@ -693,6 +693,9 @@ NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; PyRef getPyUnoClass( const Runtime &) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/pyuno_runtime.cxx new/ooo310-m11-ure/pyuno/source/module/pyuno_runtime.cxx --- old/ooo310-m10-ure/pyuno/source/module/pyuno_runtime.cxx 2008-04-11 12:35:15.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/pyuno_runtime.cxx 2009-04-22 16:54:40.000000000 +0200 @@ -119,6 +119,9 @@ NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; /*---------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/uno.py new/ooo310-m11-ure/pyuno/source/module/uno.py --- old/ooo310-m10-ure/pyuno/source/module/uno.py 2008-12-11 14:57:12.000000000 +0100 +++ new/ooo310-m11-ure/pyuno/source/module/uno.py 2009-04-22 16:54:40.000000000 +0200 @@ -250,19 +250,16 @@ #--------------------------------------------------------------------------------------- # don't use any functions beyond this point, private section, likely to change #--------------------------------------------------------------------------------------- -def _uno_import( name, *optargs ): +#def _uno_import( name, globals={}, locals={}, fromlist=[], level=-1 ): +def _uno_import( name, *optargs, **kwargs ): try: # print "optargs = " + repr(optargs) - if len(optargs) == 0: - return _g_delegatee( name ) - #print _g_delegatee - return _g_delegatee( name, *optargs ) + return _g_delegatee( name, *optargs, **kwargs ) except ImportError: - if len(optargs) != 3 or not optargs[2]: - raise - globals = optargs[0] - locals = optargs[1] - fromlist = optargs[2] + # process optargs + globals, locals, fromlist = list(optargs)[:3] + [kwargs.get('globals',{}), kwargs.get('locals',{}), kwargs.get('fromlist',[])][len(optargs):] + if not fromlist: + raise modnames = name.split( "." ) mod = None d = sys.modules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org