Hello community, here is the log from the commit of package OpenOffice_org-components for openSUSE:Factory checked in at Fri Aug 7 16:17:02 CEST 2009. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2009-07-23 21:59:10.000000000 +0200 +++ OpenOffice_org-components/OpenOffice_org-components.changes 2009-08-04 22:42:01.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 4 22:19:15 CEST 2009 - pmladek@suse.cz + +- updated to the milestone ooo310-m17 +- updated ooo-build to version 3.1.0.99.2 (3.1.1-beta2) +- updated extra localizations sources: bg el mk nb nn sk sl + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m16-components.tar.bz2 New: ---- ooo310-m17-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.UUmvTu/_old 2009-08-07 16:15:51.000000000 +0200 +++ /var/tmp/diff_new_pack.UUmvTu/_new 2009-08-07 16:15:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.1.0.99.1) +# spec file for package OpenOffice_org-components (Version 3.1.0.99.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-components -Version: 3.1.0.99.1 +Version: 3.1.0.99.2 Release: 1 -%define ooo_build_version 3.1.0.99.1 +%define ooo_build_version 3.1.0.99.2 %define piece components #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -47,7 +47,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m16 +%define ooo_build_tag ooo310-m17 License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar) Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo-sdf-components.tar.bz2 ++++++ ++++ 34214 lines of diff (skipped) ++++++ ooo310-m16-components.tar.bz2 -> ooo310-m17-components.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ooo310-m16-components/setup_native/source/packinfo/package_names_ext.txt new/ooo310-m17-components/setup_native/source/packinfo/package_names_ext.txt --- old/ooo310-m16-components/setup_native/source/packinfo/package_names_ext.txt 2008-12-02 18:02:57.000000000 +0100 +++ new/ooo310-m17-components/setup_native/source/packinfo/package_names_ext.txt 2009-07-28 02:10:07.000000000 +0200 @@ -8,10 +8,14 @@ SUNWgnome-base-libs GNOME base GUI libraries - platform dependent files, /usr filesystem SUNWgnome-config GNOME configuration framework - platform dependent files, /usr filesystem SUNWgnome-vfs GNOME Virtual File System Framework and application/MIME type registry - platform dependent files, /usr filesystem +SUNWgzip The GNU Zip (gzip) compression utility +SUNWmfrun Motif RunTime Kit SUNWkvm Core Architecture, (Kvm) SUNWlibC Sun Workshop Compilers Bundled libC +SUNWPython The Python interpreter, libraries and utilities SUNWxwplt X Window System platform software SUNWxwrtl X Window System & Graphics Runtime Library Links in /usr/lib +SUNWzlibr The Zip compression library (Root) SUNWbtool CCS tools bundled with SunOS SUNWxcu4 XCU4 Utilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ooo310-m16-components/setup_native/source/packinfo/packinfo_office.txt new/ooo310-m17-components/setup_native/source/packinfo/packinfo_office.txt --- old/ooo310-m16-components/setup_native/source/packinfo/packinfo_office.txt 2009-04-15 16:46:34.000000000 +0200 +++ new/ooo310-m17-components/setup_native/source/packinfo/packinfo_office.txt 2009-07-28 02:10:07.000000000 +0200 @@ -162,7 +162,7 @@ Start module = "gid_Module_Optional_Binfilter" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-binfilter" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-writer" @@ -177,7 +177,7 @@ Start module = "gid_Module_Optional_Grfflt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-graphicfilter" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -192,7 +192,7 @@ Start module = "gid_Module_Oooimprovement" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-oooimprovement" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-oooimprovement" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -207,7 +207,7 @@ Start module = "gid_Module_Optional_Testtool" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,SUNWmfrun" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-testtool" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -282,7 +282,7 @@ Start module = "gid_Module_Optional_Onlineupdate" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWlibC" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWgzip" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-onlineupdate" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2005 by Sun Microsystems" @@ -296,7 +296,7 @@ Start module = "gid_Module_Optional_Pyuno" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWPython" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -371,7 +371,7 @@ Start module = "gid_Module_Oo_Linguistic" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ooolinguistic" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" @@ -387,7 +387,7 @@ module = "gid_Module_Root_Files_2" script = "shellscripts_module.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, SUNWlibC, SUNWmfrun" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" freebsdrequires = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ooo310-m16-components/setup_native/source/packinfo/packinfo_office_lang.txt new/ooo310-m17-components/setup_native/source/packinfo/packinfo_office_lang.txt --- old/ooo310-m16-components/setup_native/source/packinfo/packinfo_office_lang.txt 2009-02-17 14:05:11.000000000 +0100 +++ new/ooo310-m17-components/setup_native/source/packinfo/packinfo_office_lang.txt 2009-07-28 02:10:07.000000000 +0200 @@ -29,6 +29,7 @@ description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -44,6 +45,7 @@ description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -59,6 +61,7 @@ description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -74,6 +77,7 @@ description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" End Start @@ -89,6 +93,7 @@ description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer" End Start @@ -104,6 +109,7 @@ description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc" End Start @@ -119,6 +125,7 @@ description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress" End Start @@ -134,6 +141,7 @@ description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw" End Start @@ -149,6 +157,7 @@ description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math" End Start @@ -164,6 +173,7 @@ description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base" End Start @@ -179,6 +189,7 @@ description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" End Start @@ -194,4 +205,5 @@ description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ooo310-m16-components/setup_native/source/packinfo/packinfo_ure.txt new/ooo310-m17-components/setup_native/source/packinfo/packinfo_ure.txt --- old/ooo310-m16-components/setup_native/source/packinfo/packinfo_ure.txt 2009-02-17 14:05:11.000000000 +0100 +++ new/ooo310-m17-components/setup_native/source/packinfo/packinfo_ure.txt 2009-07-28 02:10:07.000000000 +0200 @@ -32,6 +32,7 @@ Start module = "gid_Module_Root" solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" +solarisrequires = "SUNWzlibr" packagename = "%UREPACKAGEPREFIX-ure" copyright = "2005-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" @@ -44,6 +45,7 @@ Start module = "gid_Module_Root_Ure_Hidden" solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" +solarisrequires = "SUNWzlibr" packagename = "%UREPACKAGEPREFIX-ure" copyright = "2005-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ooo310-m16-components/setup_native/source/packinfo/shellscripts_extensions.txt new/ooo310-m17-components/setup_native/source/packinfo/shellscripts_extensions.txt --- old/ooo310-m16-components/setup_native/source/packinfo/shellscripts_extensions.txt 2008-06-25 13:03:08.000000000 +0200 +++ new/ooo310-m17-components/setup_native/source/packinfo/shellscripts_extensions.txt 2009-07-28 02:10:07.000000000 +0200 @@ -22,20 +22,32 @@ mkdir "$$INSTDIR" fi +# +# Need to check diskless service install and make sure use the correct unpkg +# +DISKLESS_SRVC=`echo $$BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_$${ARCH}.all` +if [ "$$DISKLESS_SRVC" ]; then + UNOPKG=/export/Solaris_11/usr_`uname -p`.all/opt/staroffice9/program/unopkg + POSTRUN=$$PKG_INSTALL_ROOT/usr_`uname -p`.all/usr/lib/postrun + CLIENT_BASEDIR=$$PKG_INSTALL_ROOT/usr_$${ARCH}.all +else + UNOPKG=$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg + POSTRUN=$$PKG_INSTALL_ROOT/usr/lib/postrun +fi # Use postrun command on Solaris where available (OpenSolaris) -if [ -x $$PKG_INSTALL_ROOT/usr/lib/postrun ]; then +if [ -x $$POSTRUN ]; then ( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" echo "umask 022" echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" add --shared --bundled \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" -) | $$PKG_INSTALL_ROOT/usr/lib/postrun -b -c UNOPKG +) | $$POSTRUN -b -c UNOPKG if [ "$$?" != "0" ]; then echo "\nERROR: Installation of UNO extension ${OXTFILENAME}" - echo " through $$PKG_INSTALL_ROOT/usr/lib/postrun failed." + echo " through $$POSTRUN failed." exit 1 fi else # No postrun available, try running unopkg directly - "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" add --shared --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$UNOPKG" add --shared --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' if [ "$$?" != "0" ]; then echo "\nERROR: Installation of UNO extension ${OXTFILENAME} failed." test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed" @@ -48,7 +60,7 @@ rm -rf "$$INSTDIR" fi -exit 0 +exit 0 END %preremove << END @@ -79,7 +91,7 @@ echo "umask 022" echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" remove --shared --bundled \"${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" echo "rm -rf \"$$INSTDIR\"" -) | $$PKG_INSTALL_ROOT/usr/lib/postrun -b -c UNOPKG +) | $$PKG_INSTALL_ROOT/usr/lib/postrun -c UNOPKG else # No postrun available, try running unopkg directly test -x $$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg || exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org