July 2009 - openSUSE Commits - openSUSE Mailing Lists

commit OpenOffice_org-components for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-components for openSUSE:Factory checked in at Mon Jul 27 18:51:58 CEST 2009. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2009-06-30 17:35:27.000000000 +0200 +++ OpenOffice_org-components/OpenOffice_org-components.changes 2009-07-23 21:59:10.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m14-components.tar.bz2 New: ---- ooo310-m16-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.jZ3liw/_old 2009-07-27 18:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.jZ3liw/_new 2009-07-27 18:51:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-components (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-components -Version: 3.1.0.98.2 +Version: 3.1.0.99.1 Release: 1 -%define ooo_build_version 3.1.0.98.2 +%define ooo_build_version 3.1.0.99.1 %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-m14 +%define ooo_build_tag ooo310-m16 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 ++++++ ooo310-m14-components.tar.bz2 -> ooo310-m16-components.tar.bz2 ++++++ ++++ 26583 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-filters for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-filters for openSUSE:Factory checked in at Mon Jul 27 18:51:09 CEST 2009. -------- --- OpenOffice_org-filters/OpenOffice_org-filters.changes 2009-06-30 17:35:37.000000000 +0200 +++ OpenOffice_org-filters/OpenOffice_org-filters.changes 2009-07-23 21:59:36.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m14-filters.tar.bz2 New: ---- ooo310-m16-filters.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-filters.spec ++++++ --- /var/tmp/diff_new_pack.xK9Hm1/_old 2009-07-27 18:51:01.000000000 +0200 +++ /var/tmp/diff_new_pack.xK9Hm1/_new 2009-07-27 18:51:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-filters (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-filters (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-filters -Version: 3.1.0.98.2 +Version: 3.1.0.99.1 Release: 1 -%define ooo_build_version 3.1.0.98.2 +%define ooo_build_version 3.1.0.99.1 %define piece filters #!BuildIgnore: OpenOffice_org 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 @@ -41,7 +41,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m14 +%define ooo_build_tag ooo310-m16 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo310-m14-filters.tar.bz2 -> ooo310-m16-filters.tar.bz2 ++++++ OpenOffice_org-filters/ooo310-m14-filters.tar.bz2 OpenOffice_org-filters/ooo310-m16-filters.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-libs-core for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-libs-core for openSUSE:Factory checked in at Mon Jul 27 18:50:46 CEST 2009. -------- --- OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2009-07-12 11:55:36.000000000 +0200 +++ OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2009-07-27 15:12:10.000000000 +0200 @@ -2 +2 @@ -Sun Jul 12 11:55:17 CEST 2009 - coolo(a)novell.com +Mon Jul 27 15:04:12 CEST 2009 - pmladek(a)suse.cz @@ -4 +4,7 @@ -- disable as-needed to fix build +- set SUSE_ASNEEDED=0 to fix linking with KDE libs in Factory + +------------------------------------------------------------------- +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) calling whatdependson for head-i586 Old: ---- ooo310-m14-libs-core.tar.bz2 New: ---- ooo310-m16-libs-core.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-core.spec ++++++ --- /var/tmp/diff_new_pack.HmmxS9/_old 2009-07-27 18:50:30.000000000 +0200 +++ /var/tmp/diff_new_pack.HmmxS9/_new 2009-07-27 18:50:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-core (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-libs-core (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-libs-core -Version: 3.1.0.98.2 -Release: 2 -%define ooo_build_version 3.1.0.98.2 +Version: 3.1.0.99.1 +Release: 1 +%define ooo_build_version 3.1.0.99.1 %define piece libs-core # version of the postgresql driver %define postgresql_version 0.7.6 @@ -48,7 +48,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m14 +%define ooo_build_tag ooo310-m16 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 @@ -185,7 +185,10 @@ export VERBOSE=1 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs} export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}" -export SUSE_ASNEEDED=0 # quick fix +# FIXME: -Wl,--as-needed is enabled by default for openSUSE-11.2 +# there are missing symbols when linking kde libraries now +# See http://fourier.suse.de/mlarch/SuSE/development-gcc/2009/development-gcc.200… +export SUSE_ASNEEDED=0 # FIXME: start it several times to avoid strange paralel build problem in basic # missing org/openoffice/vba/XErrObject.hpp # same problem happens also in linguistic ++++++ ooo310-m14-libs-core.tar.bz2 -> ooo310-m16-libs-core.tar.bz2 ++++++ OpenOffice_org-libs-core/ooo310-m14-libs-core.tar.bz2 OpenOffice_org-libs-core/ooo310-m16-libs-core.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-libs-gui for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-libs-gui for openSUSE:Factory checked in at Mon Jul 27 18:50:09 CEST 2009. -------- --- OpenOffice_org-libs-gui/OpenOffice_org-libs-gui.changes 2009-07-10 12:23:42.000000000 +0200 +++ OpenOffice_org-libs-gui/OpenOffice_org-libs-gui.changes 2009-07-27 15:12:15.000000000 +0200 @@ -2 +2 @@ -Fri Jul 10 12:23:21 CEST 2009 - coolo(a)novell.com +Mon Jul 27 15:03:21 CEST 2009 - pmladek(a)suse.cz @@ -4 +4,7 @@ -- disable as-needed as temporary fix to build +- set SUSE_ASNEEDED=0 to fix linking with KDE libs in Factory + +------------------------------------------------------------------- +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) calling whatdependson for head-i586 Old: ---- ooo310-m14-libs-gui.tar.bz2 New: ---- ooo310-m16-libs-gui.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-gui.spec ++++++ --- /var/tmp/diff_new_pack.HabqF9/_old 2009-07-27 18:49:41.000000000 +0200 +++ /var/tmp/diff_new_pack.HabqF9/_new 2009-07-27 18:49:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-gui (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-libs-gui (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,9 +20,9 @@ %define distro SUSE Name: OpenOffice_org-libs-gui -Version: 3.1.0.98.2 -Release: 2 -%define ooo_build_version 3.1.0.98.2 +Version: 3.1.0.99.1 +Release: 1 +%define ooo_build_version 3.1.0.99.1 %define piece libs-gui #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -43,7 +43,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m14 +%define ooo_build_tag ooo310-m16 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 @@ -103,12 +103,15 @@ %build # setup env. -export SUSE_ASNEEDED=0 # quick fix export OO_INSTDIR=%{_libdir}/%ooo_home export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin export VERBOSE=1 export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs} export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}" +# FIXME: -Wl,--as-needed is enabled by default for openSUSE-11.2 +# there are missing symbols when linking kde libraries now +# See http://fourier.suse.de/mlarch/SuSE/development-gcc/2009/development-gcc.200… +export SUSE_ASNEEDED=0 #FIXME: temporary hack because of dependency problem in toolkit $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 ++++++ ooo310-m14-libs-gui.tar.bz2 -> ooo310-m16-libs-gui.tar.bz2 ++++++ OpenOffice_org-libs-gui/ooo310-m14-libs-gui.tar.bz2 OpenOffice_org-libs-gui/ooo310-m16-libs-gui.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-libs-extern for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Mon Jul 27 18:49:23 CEST 2009. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2009-06-30 17:38:25.000000000 +0200 +++ OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2009-07-23 22:02:55.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m14-libs-extern-sys.tar.bz2 ooo310-m14-libs-extern.tar.bz2 New: ---- ooo310-m16-libs-extern-sys.tar.bz2 ooo310-m16-libs-extern.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.j4Skar/_old 2009-07-27 18:48:25.000000000 +0200 +++ /var/tmp/diff_new_pack.j4Skar/_new 2009-07-27 18:48:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-extern (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-libs-extern (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-libs-extern -Version: 3.1.0.98.2 +Version: 3.1.0.99.1 Release: 1 -%define ooo_build_version 3.1.0.98.2 +%define ooo_build_version 3.1.0.99.1 %define piece libs-extern #!BuildIgnore: OpenOffice_org # urg, ure dep is now required for cppunit ... @@ -40,7 +40,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m14 +%define ooo_build_tag ooo310-m16 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 ++++++ ooo310-m14-libs-extern-sys.tar.bz2 -> ooo310-m16-libs-extern-sys.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo310-m14-libs-extern-sys.tar.bz2 OpenOffice_org-libs-extern/ooo310-m16-libs-extern-sys.tar.bz2 differ: char 11, line 1 ++++++ ooo310-m14-libs-extern.tar.bz2 -> ooo310-m16-libs-extern.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo310-m14-libs-extern.tar.bz2 OpenOffice_org-libs-extern/ooo310-m16-libs-extern.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-artwork for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-artwork for openSUSE:Factory checked in at Mon Jul 27 18:47:28 CEST 2009. -------- --- OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2009-06-29 21:21:07.000000000 +0200 +++ OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2009-07-23 21:58:17.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m14-artwork.tar.bz2 New: ---- ooo310-m16-artwork.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-artwork.spec ++++++ --- /var/tmp/diff_new_pack.EAI8IL/_old 2009-07-27 18:46:48.000000000 +0200 +++ /var/tmp/diff_new_pack.EAI8IL/_new 2009-07-27 18:46:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-artwork (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-artwork (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: OpenOffice_org-artwork -Version: 3.1.0.98.2 +Version: 3.1.0.99.1 Release: 1 -%define ooo_build_version 3.1.0.98.2 +%define ooo_build_version 3.1.0.99.1 %define piece artwork #!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-m14 +%define ooo_build_tag ooo310-m16 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 ++++++ ooo310-m14-artwork.tar.bz2 -> ooo310-m16-artwork.tar.bz2 ++++++ OpenOffice_org-artwork/ooo310-m14-artwork.tar.bz2 OpenOffice_org-artwork/ooo310-m16-artwork.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-ure for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-ure for openSUSE:Factory checked in at Mon Jul 27 18:46:31 CEST 2009. -------- --- OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-06-30 17:38:51.000000000 +0200 +++ OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-07-23 22:03:20.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m14-sdk.tar.bz2 ooo310-m14-ure.tar.bz2 New: ---- ooo310-m16-sdk.tar.bz2 ooo310-m16-ure.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-ure.spec ++++++ --- /var/tmp/diff_new_pack.tICN9e/_old 2009-07-27 18:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.tICN9e/_new 2009-07-27 18:45:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-ure (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-ure (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: OpenOffice_org-ure -Version: 3.1.0.98.2 +Version: 3.1.0.99.1 Release: 1 -%define ooo_build_version 3.1.0.98.2 +%define ooo_build_version 3.1.0.99.1 %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-m14 +%define ooo_build_tag ooo310-m16 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 ++++++ ooo310-m14-sdk.tar.bz2 -> ooo310-m16-sdk.tar.bz2 ++++++ ++++++ ooo310-m14-ure.tar.bz2 -> ooo310-m16-ure.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-bootstrap for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-bootstrap for openSUSE:Factory checked in at Mon Jul 27 18:45:34 CEST 2009. -------- --- OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2009-06-30 15:57:06.000000000 +0200 +++ OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2009-07-23 21:58:46.000000000 +0200 @@ -1,0 +2,42 @@ +Thu Jul 23 21:16:24 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m16 +- updated ooo-build to version 3.1.0.99.1 (3.1.1-beta1): + * features: + * new unopkg add --link option + * new -bulk option to convert documents on the command line + * common bug fixes: + * updated Graphite font technology stuff + * avoid sticky state of fullscreen window (i#103145) + * Calc fixes: + * XLS import crasher (bnc#520556) + * scrolling with large selection (n#518426) + * determine in-line array size more reliably + * more on row and flags manipulations (n#516406) + * hyperlink strings XLS import (bnc#521447, i#103520) + * COUNTIF with external references (bnc#521624, i#102750) + * absolute path generation for external doc URI (i#103317) + * clink on hyperlinks behavior in Calc (i#103587, n#523005) + * document is modified when switching external link (i#103598) + * Impress fixes: + * no impress layout pane in master page mode (i#73289) + * Writer fixes: + * RTF export crash (bnc#462657) + * lost indentation during DOC import (bnc#518731) + * VBA bits: + * ComboBox binding data import in userform + * create toolbar/menubar in document scope + * variable as VBA constant (bnc#521820) + * set Enabled/Disabled to menu item (i#103486) + * automation objects, automation bridge wrapper (bnc#507501) + * WorkBook.PrecisionAsDisplayed, and CommandbarControl.Enabled, support + workbook auto_open event, builtin toolbar (bnc#520228) + * OOXML bits: + * shape map crash + * action buttons PPTX export (bnc#497570) + * footnote in a table DOCX import crasher (bnc#518741) + * l10n bits: + * ooo-build.pot update + * Serbian translation update + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo-build-3.1.0.98.2.tar.gz ooo310-m14-bootstrap.tar.bz2 New: ---- ooo-build-3.1.0.99.1.tar.gz ooo310-m16-bootstrap.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.3i2xSn/_old 2009-07-27 18:45:14.000000000 +0200 +++ /var/tmp/diff_new_pack.3i2xSn/_new 2009-07-27 18:45:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-bootstrap (Version 3.1.0.98.2) +# spec file for package OpenOffice_org-bootstrap (Version 3.1.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -114,11 +114,11 @@ %define ooo_home ooo3 %define ooo_basis_dir basis3.1 %define ooo_build_dir build -%define ooo_build_version 3.1.0.98.2 -%define ooo_build_tag ooo310-m14 +%define ooo_build_version 3.1.0.99.1 +%define ooo_build_tag ooo310-m16 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 -Version: 3.1.0.98.2 +Version: 3.1.0.99.1 Release: 1 AutoReqProv: on Summary: OpenOffice.org Build Bootstrap ++++++ ooo-build-3.1.0.98.2.tar.gz -> ooo-build-3.1.0.99.1.tar.gz ++++++ OpenOffice_org-bootstrap/ooo-build-3.1.0.98.2.tar.gz OpenOffice_org-bootstrap/ooo-build-3.1.0.99.1.tar.gz differ: char 5, line 1 ++++++ ooo310-m14-bootstrap.tar.bz2 -> ooo310-m16-bootstrap.tar.bz2 ++++++ OpenOffice_org-bootstrap/ooo310-m14-bootstrap.tar.bz2 OpenOffice_org-bootstrap/ooo310-m16-bootstrap.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build-compare for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at Mon Jul 27 18:43:35 CEST 2009. -------- --- build-compare/build-compare.changes 2009-07-23 15:30:49.000000000 +0200 +++ build-compare/build-compare.changes 2009-07-27 10:38:24.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jul 27 10:36:49 CEST 2009 - aj(a)suse.de + +- Fail rpm-check if unrpm does not exist (noticed with package + build). + +------------------------------------------------------------------- +Sun Jul 26 21:06:06 CEST 2009 - aj(a)suse.de + +- Fix problem found with building gettext-tools: tar packages + directories. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.fp0m3P/_old 2009-07-27 18:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.fp0m3P/_new 2009-07-27 18:42:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package build-compare (Version 2009.07.23) +# spec file for package build-compare (Version 2009.07.27) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script -Version: 2009.07.23 +Version: 2009.07.27 Release: 1 Source: same-build-result.sh Source1: rpm-check.sh ++++++ rpm-check.sh ++++++ --- /var/tmp/diff_new_pack.fp0m3P/_old 2009-07-27 18:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.fp0m3P/_new 2009-07-27 18:42:57.000000000 +0200 @@ -8,6 +8,11 @@ RPM="rpm -qp --nodigest --nosignature" +if [ ! -e /usr/bin/unrpm ] ; then + echo "unrpm is not installed - comparison not possible" + exit 1 +fi + check_all= case $1 in -a | --check-all) @@ -266,7 +271,8 @@ fi fi done - return $ret;; + return $ret + ;; *.zip|*.jar) cd old unjar_l ./$file > flist @@ -409,6 +415,10 @@ return 1 fi ;; + *directory) + # tar might package directories - ignore them here + return 0 + ;; *) if ! diff_two_files; then return 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at Mon Jul 27 18:42:42 CEST 2009. -------- --- build/build.changes 2009-06-03 15:05:18.000000000 +0200 +++ build/build.changes 2009-07-27 17:09:11.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Jul 27 17:03:47 CEST 2009 - ro(a)suse.de + +- update to current svn (r7751) + - support for legacy releasepkg mechanism + - only print parse warnings if $config->{'warnings'} is set + - set warnings for expanddeps/substitutedeps + - use UTC as default timezone + - also consider patches as sources + - do not call depmod until we use also the native kernel, + it can't match otherwise + - return with value 3, if basic file system creation fails. + bs_worker will mark the build host as bad and retries on another one. + - handle files from service correctly and strip their prefix. + - - also add rpmv3 compatibility hack to createrpmdeps + - mount proc filesystem for build compare run + - fix for ccache support from + - add build-ids for debuginfo packages for subpacks + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- build-2009.06.04.tar.gz New: ---- build-2009.07.27.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.fY5s5u/_old 2009-07-27 18:41:57.000000000 +0200 +++ /var/tmp/diff_new_pack.fY5s5u/_new 2009-07-27 18:41:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2009.06.04) +# spec file for package build (Version 2009.07.27) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2009.06.04 +Version: 2009.07.27 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") ++++++ build-2009.06.04.tar.gz -> build-2009.07.27.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/Build/Rpm.pm new/build-2009.07.27/Build/Rpm.pm --- old/build-2009.06.04/Build/Rpm.pm 2009-06-03 15:07:11.000000000 +0200 +++ new/build-2009.07.27/Build/Rpm.pm 2009-07-20 16:06:38.000000000 +0200 @@ -185,7 +185,7 @@ my $tries = 0; while ($line =~ /^(.*?)%(\{([^\}]+)\}|[\?\!]*[0-9a-zA-Z_]+|%|\()(.*?)$/) { if ($tries++ > 1000) { - print STDERR "Warning: spec file parser ",($lineno?" line $lineno":''),": macro too deeply nested\n"; + print STDERR "Warning: spec file parser ",($lineno?" line $lineno":''),": macro too deeply nested\n" if $config->{'warnings'}; $line = 'MACRO'; last; } @@ -207,7 +207,7 @@ $expandedline .= '%'; next; } elsif ($macname eq '(') { - print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand %(...)\n"; + print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand %(...)\n" if $config->{'warnings'}; $line = 'MACRO'; last; } elsif ($macname eq 'define' || $macname eq 'global') { @@ -242,7 +242,7 @@ $line = ((exists($macros{$args[0]}) ? 1 : 0) ^ ($macname eq 'undefined' || $macname eq 'without' ? 1 : 0)).$line; } elsif (exists($macros{$macname})) { if (!defined($macros{$macname})) { - print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand '$macname'\n"; + print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand '$macname'\n" if $config->{'warnings'}; $line = 'MACRO'; last; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/Build.pm new/build-2009.07.27/Build.pm --- old/build-2009.06.04/Build.pm 2009-06-03 13:39:10.000000000 +0200 +++ new/build-2009.07.27/Build.pm 2009-07-20 16:06:39.000000000 +0200 @@ -216,6 +216,8 @@ $config->{'patterntype'} = [ @l ]; } elsif ($l0 eq 'release:') { $config->{'release'} = $l[0]; + } elsif ($l0 eq 'releaseprg:') { + $config->{'releaseprg'} = $l[0]; } elsif ($l0 eq 'changetarget:') { $config->{'changetarget'} = join(' ', @l); } elsif ($l0 !~ /^[#%]/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/baselibs_global.conf new/build-2009.07.27/baselibs_global.conf --- old/build-2009.06.04/baselibs_global.conf 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/baselibs_global.conf 2009-07-27 16:59:26.000000000 +0200 @@ -36,4 +36,5 @@ package /(.*)-debuginfo$/ +/usr/lib(64)?/debug/.*/lib(64)?/.*\.(so.*|o|a|la)\.debug$ ++/usr/lib(64)?/debug/.build-id/.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/build new/build-2009.07.27/build --- old/build-2009.06.04/build 2009-06-03 13:39:10.000000000 +0200 +++ new/build-2009.07.27/build 2009-07-23 17:52:28.000000000 +0200 @@ -235,7 +235,7 @@ rm -f $BUILD_ROOT/var/lib/build/ccache/bin/$i test -e $BUILD_ROOT/usr/bin/$i || continue echo '#! /bin/sh' > $BUILD_ROOT/var/lib/build/ccache/bin/$i - echo "test -e /usr/bin/$i || exit 1" > $BUILD_ROOT/var/lib/build/ccache/bin/$i + echo "test -e /usr/bin/$i || exit 1" >> $BUILD_ROOT/var/lib/build/ccache/bin/$i echo 'export PATH=/opt/icecream/bin:/usr/bin:$PATH' >> $BUILD_ROOT/var/lib/build/ccache/bin/$i echo "ccache $i \"\$@\"" >> $BUILD_ROOT/var/lib/build/ccache/bin/$i chmod 755 $BUILD_ROOT/var/lib/build/ccache/bin/$i @@ -758,7 +758,7 @@ if test -n "$LIST_STATE" ; then BUILD_ROOT=`mktemp -d /var/tmp/build-list-state-XXXXXX` - test -d "$BUILD_ROOT" || cleanup_and_exit 1 + test -d "$BUILD_ROOT" || cleanup_and_exit 3 SPECFILE=$SPECFILES # only one specified anyways if test "$SPECFILE" != "${SPECFILE%.src.rpm}" ; then rm -rf $BUILD_ROOT/usr/src/packages @@ -766,7 +766,7 @@ rpm -i --nodigest --nosignature --root $BUILD_ROOT $SPECFILE || { echo "could not install $SPECFILE." 2>&1 rm -rf $BUILD_ROOT - cleanup_and_exit 1 + cleanup_and_exit 3 } for SPECFILE in $BUILD_ROOT/usr/src/packages/SPECS/*.spec ; do : ; done fi @@ -783,22 +783,22 @@ fi if test ! -e "$VM_IMAGE" ; then echo "you need to create a file system on $VM_IMAGE first" - cleanup_and_exit 1 + cleanup_and_exit 3 fi fi if test -n "$VM_IMAGE" ; then if test -n "$CLEAN_BUILD" ; then echo "Creating filesystem on $VM_IMAGE" - $vm_img_mkfs $VM_IMAGE || become_root_or_fail + $vm_img_mkfs $VM_IMAGE || cleanup_and_exit 3 if test -n "$vm_img_tunefs" ; then - $vm_img_tunefs $VM_IMAGE || become_root_or_fail + $vm_img_tunefs $VM_IMAGE || cleanup_and_exit 3 fi fi mkdir_build_root if [ -w /root ]; then - mount -o loop $VM_IMAGE $BUILD_ROOT || cleanup_and_exit 1 + mount -o loop $VM_IMAGE $BUILD_ROOT || cleanup_and_exit 3 else - mount $BUILD_ROOT || become_root_or_fail + mount $BUILD_ROOT || cleanup_and_exit 3 fi else test -w /root || become_root_or_fail @@ -1234,6 +1234,10 @@ cp -p "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/ fi test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir && rm -rf "$MYSRCDIR" + # strip prefix from autogenerated files from OBS. + for i in $BUILD_ROOT$TOPDIR/SOURCES/_service\:*; do + mv "$i" "${i##*:}" + done CHANGELOGARGS= test -n "$CHANGELOG" -a -f "$BUILD_ROOT/.build-changelog" && CHANGELOGARGS="--changelog $BUILD_ROOT/.build-changelog" @@ -1636,7 +1640,7 @@ args="--padstart 512 --padend 512 -v" case "$BUILDTYPE" in spec) - computeblocklists $args $TOPDIR/RPMS/*/*.rpm $TOPDIR/SRPMS/*.rpm > "$VM_SWAP" + computeblocklists $args $TOPDIR/RPMS/*/*.rpm $TOPDIR/SRPMS/* > "$VM_SWAP" ;; dsc) computeblocklists $args $TOPDIR/DEBS/*.deb $TOPDIR/SOURCES.DEB/* > "$VM_SWAP" @@ -1650,7 +1654,9 @@ if test -n "$RPMS" -a -d "$BUILD_ROOT/$TOPDIR/RPMS" -a -d "$BUILD_ROOT/.build.oldpackages" -a -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then echo "... comparing built packages with the former built" # exit with 2, if packages built successfull, but have no changes to former built packages. + mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS" && cleanup_and_exit 2 + umount -n $BUILD_ROOT/proc 2> /dev/null fi echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/createrpmdeps new/build-2009.07.27/createrpmdeps --- old/build-2009.06.04/createrpmdeps 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/createrpmdeps 2009-07-20 16:06:39.000000000 +0200 @@ -97,6 +97,14 @@ $known2path{$known} = $path; } } + # rpm3 compatibility: retrofit missing self provides + my $name = $res{1000}->[0]; + if (!@{$res{1047} || []} || $res{1047}->[-1] !~ /^\Q$name\E =/) { + my $evr = "$res{1001}->[0]-$res{1002}->[0]"; + $evr = "$res{1003}->[0]:$evr" if $res{1003} && $res{1003}->[0]; + push @{$res{1047}}, "$name = $evr"; + } + $newp{$known} = "P:$known: ".join(' ', @{$res{1047} || []}); $newr{$known} = "R:$known: ".join(' ', @{$res{1049} || []}); #$tag{$known} = $res{1000}->[0]."-".$res{1001}->[0]."-".$res{1002}->[0]." ".$res{1007}->[0]."-".$res{1006}->[0]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/expanddeps new/build-2009.07.27/expanddeps --- old/build-2009.06.04/expanddeps 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/expanddeps 2009-07-20 16:06:39.000000000 +0200 @@ -165,6 +165,7 @@ } my $cf = Build::read_config_dist($dist, $archs[0], $configdir); +$cf->{'warnings'} = 1; ####################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/init_buildsystem new/build-2009.07.27/init_buildsystem --- old/build-2009.06.04/init_buildsystem 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/init_buildsystem 2009-07-20 16:06:39.000000000 +0200 @@ -820,6 +820,12 @@ chroot $BUILD_ROOT rpm -q --whatprovides rpm >/dev/null 2>&1 fi +# create modules.dep in kvm/xen +# This can not work, until we use the native repository kernel +#if [ $BUILD_ROOT = "/" -a -x /sbin/depmod ]; then +# /sbin/depmod -a +#fi + rm -rf $BUILD_ROOT/.init_b_cache rm -f $BUILD_IS_RUNNING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/spectool new/build-2009.07.27/spectool --- old/build-2009.06.04/spectool 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/spectool 2009-07-20 16:06:39.000000000 +0200 @@ -272,7 +272,7 @@ my $srcfile = read_sources_digests($files, $spec); if ($opt_download) { for my $t (keys %$parsed) { - next unless ($t =~ /^source\d*/); + next unless ($t =~ /^(?:source|patch)\d*/); my $url = $parsed->{$t}; next unless $url =~ /^(?:http|ftp):\/\//; my $file = $url; @@ -297,7 +297,7 @@ if ($opt_update) { my $changed; for my $t (keys %$parsed) { - next unless ($t =~ /^source\d*/); + next unless ($t =~ /^(?:source|patch)\d*/); my $file = $parsed->{$t}; $file =~ s/.*\///; next unless -B $file; @@ -319,7 +319,7 @@ } } else { for my $t (keys %$parsed) { - next unless ($t =~ /^source\d*/); + next unless ($t =~ /^(?:source|patch)\d*/); my $file = $parsed->{$t}; $file =~ s/.*\///; if (!exists $files->{$file}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/substitutedeps new/build-2009.07.27/substitutedeps --- old/build-2009.06.04/substitutedeps 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/substitutedeps 2009-07-20 16:06:39.000000000 +0200 @@ -8,9 +8,24 @@ use Build; -my ($dist, $rpmdeps, $archs, $configdir, $release, $changelog); + +sub expand { + my ($config, $str) = @_; + my @xspec; + my %cf = %$config; + $cf{'save_expanded'} = 1; + Build::Rpm::parse(\%cf, [ "$str" ], \@xspec); + return @xspec && ref($xspec[0]) ? $xspec[0]->[1] : ''; +} + +my ($dist, $buildroot, $rpmdeps, $archs, $configdir, $release, $changelog); while (@ARGV) { + if ($ARGV[0] eq '--root') { + shift @ARGV; + $buildroot = shift @ARGV; + next; + } if ($ARGV[0] eq '--dist') { shift @ARGV; $dist = shift @ARGV; @@ -40,9 +55,14 @@ } die("Usage: substitutedeps --dist <dist> --archpath <archpath> [--configdir <configdir>] <specin> <specout>\n") unless @ARGV == 2; my $spec = $ARGV[0]; +my $specdir = $spec; +$specdir =~ s/[^\/]*$//; +$specdir = "./" if $specdir eq ''; + my $newspec = $ARGV[1]; my $cf = Build::read_config_dist($dist, $archs, $configdir); +$cf->{'warnings'} = 1; ####################################################################### @@ -60,6 +80,9 @@ my $used; my $inchangelog = 0; +my $mainpkg = ''; +my $pkg; + for my $l (@$xspec) { $used = 1; if (ref($l)) { @@ -80,8 +103,20 @@ next; } - if ($release) { - if ($l =~ /^Release:/i) { + if ($l =~ /^Name\s*:\s*(\S+)/i) { + $pkg = $mainpkg = $1 unless $mainpkg; + } + if ($l =~ /^\s*%package\s+(-n\s+)?(\S+)/) { + if ($1) { + $pkg = $2; + } else { + $pkg = "$mainpkg-$2"; + } + } + + if ($l =~ /^Release:/i) { + my $oldl = $l; + if ($release) { if (!($l =~ s/<RELEASE\d*>/$release/g)) { if ($l =~ /<(?:CI_CNT|B_CNT)>/) { # XXX: should pass ci_cnt/b_cnt instead @@ -98,6 +133,74 @@ } } } + # this is to be compatible to legacy autobuild. + # you can specify a releaseprg in the project configuration, + # if your package contains this file it is executed and its + # output is used as a release. + # use only if you really must. + if ($cf->{'releaseprg'} && -f "$specdir$cf->{'releaseprg'}") { + my $newl = $l; + $newl =~ s/^Release:\s*//; + $oldl =~ s/^Release:\s*//; + my $project = expand($cf, "%?_project") || 'BUILD_BASENAME'; + my $arch = expand($cf, "%?_target_cpu") || 'noarch'; + $::ENV{'BUILD_OLDRELEASE'} = $oldl; + my @nl; + my $interpreter = "/bin/bash"; + if (open(RP, '<', "$specdir$cf->{'releaseprg'}")) { + @nl = <RP>; + close RP; + if (@nl && $nl[0] =~ /^#!\s*(\S*)/) { + $interpreter = $1; + } + } + if ($buildroot) { + my $sd = $specdir; + $sd =~ s/^\Q$buildroot\E//; + open(RP, "-|", 'chroot', $buildroot, $interpreter, "$sd$cf->{'releaseprg'}", $project, $newl, $pkg, $arch) || die("$cf->{'releaseprg'}: $!\n"); + } else { + open(RP, "-|", $interpreter, "$specdir$cf->{'releaseprg'}", $project, $newl, $pkg, $arch) || die("$cf->{'releaseprg'}: $!\n"); + } + @nl = grep {$_ ne ''} <RP>; + if (!close(RP)) { + warn("$cf->{'releaseprg'} failed: $?\n"); + } + # and another compatibility hack: if the prg returns pkg:<package>, + # the release of the package will be used. yuck... + if (@nl && $nl[0] =~ s/^pkg://) { + my $relpkg = $nl[0]; + chomp $relpkg; + if ($buildroot) { + open(RP, "-|", 'chroot', $buildroot, 'rpm', '-q', '--qf', '%{RELEASE}', $relpkg) || die("rpm: $!\n"); + } else { + open(RP, "-|", 'rpm', '-q', '--qf', '%{RELEASE}', $relpkg) || die("rpm: $!\n"); + } + @nl = grep {$_ ne ''} <RP>; + if (!close(RP)) { + warn("rpm package query of '$relpkg' failed: $?\n"); + } + } + if ($nl[0]) { + chomp $nl[0]; + $l =~ s/^(Release:\s*).*/$1$nl[0]/i; + if ($release) { + if (!($l =~ s/<RELEASE\d*>/$release/g)) { + if ($l =~ /<(?:CI_CNT|B_CNT)>/) { + # XXX: should pass ci_cnt/b_cnt instead + if ($release =~ /(\d+)\.(\d+)$/) { + my ($ci, $b) = ($1, $2); + $l =~ s/<CI_CNT>/$ci/; + $l =~ s/<B_CNT>/$b/; + } elsif ($release =~ /(\d+)$/) { + my $b = $1; + $l =~ s/<B_CNT>/$b/ unless $l =~ s/<CI_CNT>/$b/; + } + } + } + } + } + } + # all compat stuff done. we return to your scheduled program } if (!$used || ($l !~ /^(?:Build)?Requires:/i)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2009.06.04/vc new/build-2009.07.27/vc --- old/build-2009.06.04/vc 2009-06-03 11:21:22.000000000 +0200 +++ new/build-2009.07.27/vc 2009-07-20 16:06:39.000000000 +0200 @@ -29,7 +29,7 @@ fi EDITOR=${EDITOR:-vim} -date=`LC_ALL=POSIX TZ=Europe/Berlin date` +date=`LC_ALL=POSIX TZ=UTC date` if ! which mktemp > /dev/null 2>&1; then echo "mktemp is required for this script to work" ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.fY5s5u/_old 2009-07-27 18:41:57.000000000 +0200 +++ /var/tmp/diff_new_pack.fY5s5u/_new 2009-07-27 18:41:57.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2009.06.04 +Version: 2009.07.27 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0