January 2010 - openSUSE Commits - openSUSE Mailing Lists

commit dvb for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package dvb for openSUSE:Factory checked in at Thu Jan 7 20:20:38 CET 2010. -------- --- dvb/dvb.changes 2009-11-24 19:11:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/dvb/dvb.changes 2010-01-03 16:40:03.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 3 16:39:11 CET 2010 - jslaby(a)suse.de + +- remove dvbscan from rpm (incomplete and defunct) +- add cz-kojal scan files + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- cz-kojal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvb.spec ++++++ --- /var/tmp/diff_new_pack.fZMKpy/_old 2010-01-07 20:20:15.000000000 +0100 +++ /var/tmp/diff_new_pack.fZMKpy/_new 2010-01-07 20:20:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dvb (Version 1.1.1MACRO) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -39,6 +39,7 @@ #Source4: http://212.227.36.83/linuxtv/downloads/firmware/dvb-ttpci-01.fw-261d Patch: dvb-apps-dvbnet.diff Patch1: dvb-includes.diff +Patch2: cz-kojal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # This package provides the firmware for some cards supported by the # dvb-ttpci.ko module. Add the modalias dependencies for this module: @@ -68,6 +69,7 @@ %setup -q -n dvb-apps-%{version} %patch %patch1 +%patch2 -p1 find -name .hg -type d | xargs rm -rfv find -name .cvsignore -type f | xargs rm -fv find -name '*.orig' -type f | xargs rm -fv @@ -125,6 +127,8 @@ # # noone really uses this so far AFAIK rm -r %{buildroot}%{_includedir} %{buildroot}%{_libdir}/*.a +# dvbscan is incomplete and defunct +rm %{buildroot}%{_bindir}/dvbscan %post %{fillup_and_insserv dvb} ++++++ cz-kojal.patch ++++++ # HG changeset patch # User Jiri Slaby <jirislaby(a)gmail.com> # Date 1262532622 -3600 # Node ID 5f093a32da807e2e324e978e36ab092402aece6f # Parent a66ed623e524395f3805ce6266354f9e52913941 add scan file for Kojal, Czech Republic diff -r a66ed623e524 -r 5f093a32da80 util/scan/dvb-t/cz-Kojal --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util/scan/dvb-t/cz-Kojal Sun Jan 03 16:30:22 2010 +0100 @@ -0,0 +1,8 @@ +# DVB-T Kojal (Brno, Czech Republic) +# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy +# CT - Ceska televize (multiplex 1) +T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE +# CRa - Ceske radiokomunikace (multiplex 2) +T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE +# Czech Digital Group (multiplex 3) +T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-firstboot for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at Thu Jan 7 16:26:10 CET 2010. -------- --- yast2-firstboot/yast2-firstboot.changes 2009-12-22 13:27:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-firstboot/yast2-firstboot.changes 2010-01-07 15:28:14.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 7 14:34:43 CET 2010 - jsuchome(a)suse.cz + +- added firstboot_licenses step able to show 2 license texts + (fate#306295) +- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.19.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-firstboot-2.19.0.tar.bz2 New: ---- yast2-firstboot-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.lg8rQ6/_old 2010-01-07 16:26:05.000000000 +0100 +++ /var/tmp/diff_new_pack.lg8rQ6/_new 2010-01-07 16:26:05.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-firstboot (Version 2.19.0) +# spec file for package yast2-firstboot (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: yast2-firstboot -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.19.0.tar.bz2 +Source0: yast2-firstboot-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -34,10 +34,10 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Keyboard::Write (), bnc#441404 -Requires: yast2-country >= 2.18.14 -# Installation startup scripts -Requires: yast2-installation +# Language::SwitchToEnglishIfNeeded +Requires: yast2-country >= 2.19.5 +# new version of inst_license +Requires: yast2-installation >= 2.19.0 BuildArch: noarch Summary: YaST2 - Initial System Configuration PreReq: %fillup_prereq @@ -54,7 +54,7 @@ created to personalize the system. %prep -%setup -n yast2-firstboot-2.19.0 +%setup -n yast2-firstboot-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-firstboot-2.19.0.tar.bz2 -> yast2-firstboot-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/VERSION new/yast2-firstboot-2.19.1/VERSION --- old/yast2-firstboot-2.19.0/VERSION 2009-12-22 13:04:33.000000000 +0100 +++ new/yast2-firstboot-2.19.1/VERSION 2010-01-07 15:12:34.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/configure new/yast2-firstboot-2.19.1/configure --- old/yast2-firstboot-2.19.0/configure 2009-12-22 13:18:56.000000000 +0100 +++ new/yast2-firstboot-2.19.1/configure 2010-01-07 15:15:10.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.19.0. +# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.19.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firstboot' PACKAGE_TARNAME='yast2-firstboot' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='yast2-firstboot 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='yast2-firstboot 2.19.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firstboot 2.19.0 to adapt to many kinds of systems. +\`configure' configures yast2-firstboot 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firstboot 2.19.0:";; + short | recursive ) echo "Configuration of yast2-firstboot 2.19.1:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firstboot configure 2.19.0 +yast2-firstboot configure 2.19.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firstboot $as_me 2.19.0, which was +It was created by yast2-firstboot $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2427,7 +2427,7 @@ # Define the identity of the package. PACKAGE='yast2-firstboot' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -2549,7 +2549,7 @@ -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3610,7 +3610,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firstboot $as_me 2.19.0, which was +This file was extended by yast2-firstboot $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3660,7 +3660,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-firstboot config.status 2.19.0 +yast2-firstboot config.status 2.19.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/configure.in new/yast2-firstboot-2.19.1/configure.in --- old/yast2-firstboot-2.19.0/configure.in 2009-12-22 13:18:53.000000000 +0100 +++ new/yast2-firstboot-2.19.1/configure.in 2010-01-07 15:15:07.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firstboot, 2.19.0, http://bugs.opensuse.org/, yast2-firstboot) +AC_INIT(yast2-firstboot, 2.19.1, http://bugs.opensuse.org/, yast2-firstboot) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/doc/firstboot-section_mod.xml new/yast2-firstboot-2.19.1/doc/firstboot-section_mod.xml --- old/yast2-firstboot-2.19.0/doc/firstboot-section_mod.xml 2009-07-07 10:05:20.000000000 +0200 +++ new/yast2-firstboot-2.19.1/doc/firstboot-section_mod.xml 2010-01-06 15:07:40.000000000 +0100 @@ -143,6 +143,10 @@ </para> <para> + To show two license texts in one dialog (typically the one from vendor and one from Novell), use 'firstboot_license_novell' step in your firstboot.xml file. This client will use the license texts specified by both FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR. + </para> + + <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/Makefile.am new/yast2-firstboot-2.19.1/src/Makefile.am --- old/yast2-firstboot-2.19.0/src/Makefile.am 2009-10-27 13:30:39.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/Makefile.am 2010-01-06 14:14:12.000000000 +0100 @@ -11,6 +11,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/Makefile.in new/yast2-firstboot-2.19.1/src/Makefile.in --- old/yast2-firstboot-2.19.0/src/Makefile.in 2009-12-22 13:18:57.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/Makefile.in 2010-01-07 15:15:10.000000000 +0100 @@ -247,6 +247,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/control/firstboot.xml new/yast2-firstboot-2.19.1/src/control/firstboot.xml --- old/yast2-firstboot-2.19.0/src/control/firstboot.xml 2009-11-03 11:06:52.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/control/firstboot.xml 2010-01-06 15:11:32.000000000 +0100 @@ -104,6 +104,11 @@ <name>firstboot_welcome</name> </module> <module> + <label>License Agreements</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_licenses</name> + </module> + <module> <label>License Agreement</label> <enabled config:type="boolean">true</enabled> <name>firstboot_license_novell</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/firstboot_keyboard.ycp new/yast2-firstboot-2.19.1/src/firstboot_keyboard.ycp --- old/yast2-firstboot-2.19.0/src/firstboot_keyboard.ycp 2009-12-22 13:03:57.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/firstboot_keyboard.ycp 2009-12-22 13:27:36.000000000 +0100 @@ -3,7 +3,7 @@ * Author : Jiri Suchomel <jsuchome(a)suse.cz> * Purpose : Firstboot configuratiuon of keyboard * - * $Id: firstboot_keyboard.ycp 58220 2009-07-30 13:46:08Z jsuchome $ + * $Id: firstboot_keyboard.ycp 60169 2009-12-22 12:27:28Z jsuchome $ */ { textdomain "country"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/firstboot_language_keyboard.ycp new/yast2-firstboot-2.19.1/src/firstboot_language_keyboard.ycp --- old/yast2-firstboot-2.19.0/src/firstboot_language_keyboard.ycp 2009-07-30 15:46:14.000000000 +0200 +++ new/yast2-firstboot-2.19.1/src/firstboot_language_keyboard.ycp 2010-01-06 17:19:38.000000000 +0100 @@ -137,13 +137,9 @@ Language::Set (language); } // Check and set CJK languages - if (ret == `language && Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `language) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.19.0/src/firstboot_licenses.ycp new/yast2-firstboot-2.19.1/src/firstboot_licenses.ycp --- old/yast2-firstboot-2.19.0/src/firstboot_licenses.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.19.1/src/firstboot_licenses.ycp 2010-01-06 15:04:19.000000000 +0100 @@ -0,0 +1,49 @@ +/* + * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration + * + * $Id: firstboot_license.ycp 57028 2009-04-29 10:58:09Z lslezak $ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "ProductFeatures"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + string dir1 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + string dir2 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + + if (dir2 != dir1) + args["directories"] = [ dir1, dir2]; + else + args["directories"] = [ dir1 ]; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-country for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at Thu Jan 7 16:25:38 CET 2010. -------- --- yast2-country/yast2-country.changes 2010-01-04 10:53:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2010-01-07 15:09:57.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 7 14:40:33 CET 2010 - jsuchome(a)suse.cz + +- added Language::SwitchToEnglishIfNeeded to be called when it might + be necessary to use English in UI, due to possible displaying + problems with another language (bnc#479529) +- 2.19.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.19.4.tar.bz2 New: ---- yast2-country-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.EPehGt/_old 2010-01-07 16:25:30.000000000 +0100 +++ /var/tmp/diff_new_pack.EPehGt/_new 2010-01-07 16:25:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.19.4) +# spec file for package yast2-country (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-country -Version: 2.19.4 +Version: 2.19.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.19.4.tar.bz2 +Source0: yast2-country-2.19.5.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -73,7 +73,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.19.4 +%setup -n yast2-country-2.19.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-country-2.19.4.tar.bz2 -> yast2-country-2.19.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.4/VERSION new/yast2-country-2.19.5/VERSION --- old/yast2-country-2.19.4/VERSION 2010-01-04 10:50:13.000000000 +0100 +++ new/yast2-country-2.19.5/VERSION 2010-01-07 14:44:10.000000000 +0100 @@ -1 +1 @@ -2.19.4 +2.19.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.4/configure new/yast2-country-2.19.5/configure --- old/yast2-country-2.19.4/configure 2010-01-04 10:50:26.000000000 +0100 +++ new/yast2-country-2.19.5/configure 2010-01-07 14:48:39.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-country 2.19.4. +# Generated by GNU Autoconf 2.63 for yast2-country 2.19.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-country' PACKAGE_TARNAME='yast2-country' -PACKAGE_VERSION='2.19.4' -PACKAGE_STRING='yast2-country 2.19.4' +PACKAGE_VERSION='2.19.5' +PACKAGE_STRING='yast2-country 2.19.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-country 2.19.4 to adapt to many kinds of systems. +\`configure' configures yast2-country 2.19.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-country 2.19.4:";; + short | recursive ) echo "Configuration of yast2-country 2.19.5:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-country configure 2.19.4 +yast2-country configure 2.19.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-country $as_me 2.19.4, which was +It was created by yast2-country $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2419,7 +2419,7 @@ # Define the identity of the package. PACKAGE='yast2-country' - VERSION='2.19.4' + VERSION='2.19.5' cat >>confdefs.h <<_ACEOF @@ -2541,7 +2541,7 @@ -VERSION="2.19.4" +VERSION="2.19.5" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3483,7 +3483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-country $as_me 2.19.4, which was +This file was extended by yast2-country $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3533,7 +3533,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-country config.status 2.19.4 +yast2-country config.status 2.19.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.4/configure.in new/yast2-country-2.19.5/configure.in --- old/yast2-country-2.19.4/configure.in 2010-01-04 10:50:22.000000000 +0100 +++ new/yast2-country-2.19.5/configure.in 2010-01-07 14:48:36.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-country, 2.19.4, http://bugs.opensuse.org/, yast2-country) +AC_INIT(yast2-country, 2.19.5, http://bugs.opensuse.org/, yast2-country) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.4" +VERSION="2.19.5" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.4/language/src/modules/Language.ycp new/yast2-country-2.19.5/language/src/modules/Language.ycp --- old/yast2-country-2.19.4/language/src/modules/Language.ycp 2009-11-19 09:51:00.000000000 +0100 +++ new/yast2-country-2.19.5/language/src/modules/Language.ycp 2010-01-07 14:40:22.000000000 +0100 @@ -134,7 +134,6 @@ return contains (cjk_languages, l); } - /** * return the value of text_mode (true for ncurses) */ @@ -1239,5 +1238,40 @@ } } +/** + * Set current YaST language to English if method for showing text in + * current language is not supported (usually for CJK languages) + * See http://bugzilla.novell.com/show_bug.cgi?id=479529 for discussion + * @boolean show_popup if information popup about the change should be shown + * @return true if UI language was changed + */ +global boolean SwitchToEnglishIfNeeded (boolean show_popup) { + + if (Stage::normal ()) + { + y2milestone ("no language switching in normal stage"); + return false; + } + if (GetTextMode () && + // current language is CJK + CJKLanguage (language) && + // fbiterm is not running + getenv ("TERM") != "iterm") + { + if (show_popup) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + } + WfmSetGivenLanguage ("en_US"); + return true; + } + return false; +} + + + + /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.4/language/src/select_language.ycp new/yast2-country-2.19.5/language/src/select_language.ycp --- old/yast2-country-2.19.4/language/src/select_language.ycp 2009-07-30 15:44:08.000000000 +0200 +++ new/yast2-country-2.19.5/language/src/select_language.ycp 2010-01-06 17:16:58.000000000 +0100 @@ -528,17 +528,10 @@ if (Stage::initial () || Stage::firstboot ()) { - if ((set_default && ret == `language || - (!set_default && ret == `next)) && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) + if ((set_default && ret == `language || (!set_default && ret == `next)) && + Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `next || (set_default && ret == `language)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 polkit for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package polkit for openSUSE:Factory checked in at Thu Jan 7 16:24:52 CET 2010. -------- --- polkit/polkit.changes 2009-08-19 23:23:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/polkit/polkit.changes 2010-01-06 18:46:44.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Jan 6 18:22:23 CET 2010 - dmueller(a)suse.de + +- update to 0.95: + The major change this release is that the lockdown feature has + been cleaned up in a way so it isn't specific to the local + authority. See the NEWS files for more details. + +------------------------------------------------------------------- +Wed Dec 16 10:44:34 CET 2009 - jengelh(a)medozas.de + +- Package documentation as noarch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- polkit-0.94.tar.bz2 New: ---- polkit-0.95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit.spec ++++++ --- /var/tmp/diff_new_pack.aquZqm/_old 2010-01-07 16:24:04.000000000 +0100 +++ /var/tmp/diff_new_pack.aquZqm/_new 2010-01-07 16:24:04.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package polkit (Version 0.94) +# spec file for package polkit (Version 0.95) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,8 +19,8 @@ Name: polkit Summary: PolicyKit Authorization Framework -Version: 0.94 -Release: 2 +Version: 0.95 +Release: 1 License: LGPLv2+ Url: http://www.freedesktop.org/wiki/Software/PolicyKit BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,6 +56,9 @@ License: LGPLv2+ Summary: Development documentation for PolicyKit Group: Development/Libraries +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description doc Development documentation for PolicyKit Authorization Framework. @@ -82,6 +85,7 @@ --enable-gtk-doc \ --disable-static \ --disable-introspection \ + --enable-examples \ --libexecdir=%{_prefix}/lib/polkit-1 make %{?jobs:-j %jobs} ++++++ polkit-0.94.tar.bz2 -> polkit-0.95.tar.bz2 ++++++ ++++ 10459 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 libdv for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package libdv for openSUSE:Factory checked in at Thu Jan 7 16:23:43 CET 2010. -------- --- libdv/libdv.changes 2009-12-18 17:24:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/libdv/libdv.changes 2010-01-07 11:42:40.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Jan 2 17:03:14 CET 2010 - vuntz(a)opensuse.org + +- Add trivial libdv-gtk2.patch to use GTK+ 2 instead of GTK+ 1. The + patch comes from Debian. +- Change gtk1-compat-devel BuildRequires to gtk2-devel. +- Remove AutoReqProv: it's default now. +- Use makeinstall macro. +- Use includedir instead of /usr/include. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libdv-gtk2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdv.spec ++++++ --- /var/tmp/diff_new_pack.dEIJAa/_old 2010-01-07 16:23:26.000000000 +0100 +++ /var/tmp/diff_new_pack.dEIJAa/_new 2010-01-07 16:23:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdv (Version 1.0.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,7 +19,7 @@ Name: libdv -BuildRequires: SDL-devel gtk1-compat-devel libstdc++-devel popt-devel +BuildRequires: SDL-devel gtk2-devel libstdc++-devel popt-devel Url: http://libdv.sourceforge.net/ License: GPLv2+ Group: Development/Libraries/Other @@ -30,11 +30,13 @@ %endif # Version: 1.0.0 -Release: 146 +Release: 147 Summary: The Quasar DV Codec Source: %name-%version.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM libdv-gtk2.patch vuntz(a)opensuse.org -- Patch from debian, to use GTK+ 2.x +Patch1: libdv-gtk2.patch Patch2: libdv.omit-excessive-warnings.patch Patch3: libdv.non_x86-reorder_block.patch Patch4: libdv-filesizecheck.patch @@ -114,6 +116,7 @@ %prep %setup -q +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -125,7 +128,7 @@ make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall %{__rm} -f %{buildroot}%{_libdir}/*.la %clean @@ -146,7 +149,7 @@ %files devel %defattr(-,root,root) -/usr/include/libdv +%{_includedir}/libdv %{_libdir}/libdv.so %{_libdir}/pkgconfig/libdv.pc ++++++ libdv-gtk2.patch ++++++ diff -urNad libdv-1.0.0~/configure libdv-1.0.0/configure --- libdv-1.0.0~/configure 2006-09-25 16:11:47.000000000 -0400 +++ libdv-1.0.0/configure 2009-03-24 14:34:21.000000000 -0400 @@ -20082,7 +20082,7 @@ have_gtk="false" if $use_gtk; then - REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4' + REQUIRES='glib-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0' if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then diff -urNad libdv-1.0.0~/configure.ac libdv-1.0.0/configure.ac --- libdv-1.0.0~/configure.ac 2006-08-06 17:38:30.000000000 -0400 +++ libdv-1.0.0/configure.ac 2009-03-24 14:34:45.000000000 -0400 @@ -162,7 +162,7 @@ dnl Checks for libraries. have_gtk="false" if $use_gtk; then - REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4' + REQUIRES='glib-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0' PKG_CHECK_MODULES(GTK,$REQUIRES,have_gtk="true",have_gtk="false") AC_DEFINE(HAVE_GTK) fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-product-creator for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Thu Jan 7 13:06:35 CET 2010. -------- --- yast2-product-creator/yast2-product-creator.changes 2009-12-22 15:49:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2010-01-06 14:21:30.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 6 13:52:43 CET 2010 - jsuchome(a)suse.cz + +- do not remove directory that can be resused (patch from varkoly, + bnc#568298) +- adapt to new paths of kiwi-config-openSUSE, changed template +- 2.19.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.19.0.tar.bz2 New: ---- yast2-product-creator-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.3aPLWU/_old 2010-01-07 13:06:18.000000000 +0100 +++ /var/tmp/diff_new_pack.3aPLWU/_new 2010-01-07 13:06:18.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-product-creator (Version 2.19.0) +# spec file for package yast2-product-creator (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: yast2-product-creator -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.19.0.tar.bz2 +Source0: yast2-product-creator-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -47,7 +47,7 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.19.0 +%setup -n yast2-product-creator-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-product-creator-2.19.0.tar.bz2 -> yast2-product-creator-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/VERSION new/yast2-product-creator-2.19.1/VERSION --- old/yast2-product-creator-2.19.0/VERSION 2009-12-22 15:32:04.000000000 +0100 +++ new/yast2-product-creator-2.19.1/VERSION 2010-01-06 13:53:51.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/configure new/yast2-product-creator-2.19.1/configure --- old/yast2-product-creator-2.19.0/configure 2009-12-22 15:45:00.000000000 +0100 +++ new/yast2-product-creator-2.19.1/configure 2010-01-06 14:19:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.19.0. +# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.19.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-product-creator' PACKAGE_TARNAME='yast2-product-creator' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='yast2-product-creator 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='yast2-product-creator 2.19.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-product-creator 2.19.0 to adapt to many kinds of systems. +\`configure' configures yast2-product-creator 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-product-creator 2.19.0:";; + short | recursive ) echo "Configuration of yast2-product-creator 2.19.1:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-product-creator configure 2.19.0 +yast2-product-creator configure 2.19.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-product-creator $as_me 2.19.0, which was +It was created by yast2-product-creator $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2420,7 +2420,7 @@ # Define the identity of the package. PACKAGE='yast2-product-creator' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -2542,7 +2542,7 @@ -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-product-creator" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3484,7 +3484,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-product-creator $as_me 2.19.0, which was +This file was extended by yast2-product-creator $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3534,7 +3534,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-product-creator config.status 2.19.0 +yast2-product-creator config.status 2.19.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/configure.in new/yast2-product-creator-2.19.1/configure.in --- old/yast2-product-creator-2.19.0/configure.in 2009-12-22 15:44:58.000000000 +0100 +++ new/yast2-product-creator-2.19.1/configure.in 2010-01-06 14:19:04.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.19.0, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.19.1, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-product-creator" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/src/ProductCreator.ycp new/yast2-product-creator-2.19.1/src/ProductCreator.ycp --- old/yast2-product-creator-2.19.0/src/ProductCreator.ycp 2009-09-04 15:23:41.000000000 +0200 +++ new/yast2-product-creator-2.19.1/src/ProductCreator.ycp 2010-01-06 14:18:55.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of product-creator, input and output functions. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: ProductCreator.ycp 58530 2009-09-04 13:23:24Z jsuchome $ + * $Id: ProductCreator.ycp 60238 2010-01-06 13:18:38Z jsuchome $ * * Representation of the configuration of product-creator. * Input and output routines. @@ -2814,7 +2814,7 @@ } else { - return false; + y2milestone("Directory %1 won't be removed", isodir); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/src/complex.ycp new/yast2-product-creator-2.19.1/src/complex.ycp --- old/yast2-product-creator-2.19.0/src/complex.ycp 2009-12-22 15:28:30.000000000 +0100 +++ new/yast2-product-creator-2.19.1/src/complex.ycp 2009-12-22 15:49:36.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: complex.ycp 57551 2009-06-12 12:39:59Z jsuchome $ + * $Id: complex.ycp 60181 2009-12-22 14:49:28Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/src/data/kiwi_templates/iso/config.xml new/yast2-product-creator-2.19.1/src/data/kiwi_templates/iso/config.xml --- old/yast2-product-creator-2.19.0/src/data/kiwi_templates/iso/config.xml 2009-02-27 12:24:13.000000000 +0100 +++ new/yast2-product-creator-2.19.1/src/data/kiwi_templates/iso/config.xml 2010-01-06 13:51:08.000000000 +0100 @@ -1,28 +1,37 @@ <?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-image-template"> +<image schemeversion="2.4" name="kiwi-image-template"> <description type="system"> <author></author> <contact></contact> <specification>Template for system image configuration</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> + <type primary="true" boot="isoboot/suse-11.2" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true">iso</type> <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> <type boot="usbboot/suse-11.1" filesystem="ext3">usb</type> <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> <type boot="oemboot/suse-11.1" filesystem="ext3" flags="unified">oem</type> <version>1.0.0</version> - <size unit="M">2000</size> <packagemanager>zypper</packagemanager> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>False</rpm-force> + <size unit="M">3000</size> + <boot-theme>openSUSE</boot-theme> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> <locale>en_US.UTF-8</locale> + <oem-swap>false</oem-swap> + <oem-boot-title>USB</oem-boot-title> + <rpm-excludedocs>false</rpm-excludedocs> </preferences> <users group="users"> <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> <user name="root" pwd="" home="/root"/> </users> - <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended"> + <repository type="rpm-md"> + <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> + </repository> + <packages type="image" patternPackageType="onlyRequired"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="yast2-live-installer"/> <package name="pam"/> <package name="pam-config"/> @@ -33,52 +42,34 @@ <package name="patch"/> <package name="zypper"/>  - <package name="3ddiag"/> - <package name="915resolution"/> <package name="ConsoleKit"/> <package name="ConsoleKit-x11"/> + <package name="DeviceKit-disks"/> <package name="DirectFB"/> - <package name="IlmBase"/> - <package name="LibVNCServer"/> + <package name="ImageMagick"/> <package name="Mesa"/> - <package name="MozillaFirefox"/> - <package name="NetworkManager"/> - <package name="NetworkManager-glib"/> - <package name="NetworkManager-kde"/> - <package name="OpenEXR"/> - <package name="OpenOffice_org"/> - <package name="OpenOffice_org-Quickstarter"/> - <package name="OpenOffice_org-branding-openSUSE"/> - <package name="OpenOffice_org-calc"/> - <package name="OpenOffice_org-draw"/> - <package name="OpenOffice_org-icon-themes"/> - <package name="OpenOffice_org-impress"/> - <package name="OpenOffice_org-kde"/> - <package name="OpenOffice_org-templates-labels-a4"/> - <package name="OpenOffice_org-templates-labels-letter"/> - <package name="OpenOffice_org-writer"/> + <package name="MozillaSunbird"/> + <package name="MozillaSunbird-translations"/> <package name="PolicyKit"/> <package name="PolicyKit-doc"/> - <package name="PolicyKit-kde"/> - <package name="SDL"/> <package name="SuSEfirewall2"/> <package name="a2ps"/> <package name="aaa_base"/> - <package name="aalib"/> <package name="acl"/> + <package name="acpica"/> <package name="acpid"/> <package name="adaptec-firmware"/> - <package name="akonadi-runtime"/> <package name="alsa"/> + <package name="alsa-firmware"/> <package name="alsa-oss"/> + <package name="alsa-plugins"/> <package name="alsa-utils"/> - <package name="amarok"/> - <package name="amarok-libvisual"/> - <package name="amarok-yauap"/> <package name="apparmor-parser"/> <package name="apparmor-profiles"/> <package name="apparmor-utils"/> + <package name="aria2"/> <package name="aspell"/> + <package name="aspell-de"/> <package name="aspell-en"/> <package name="atk"/> <package name="atmel-firmware"/> @@ -86,91 +77,76 @@ <package name="audiofile"/> <package name="audit"/> <package name="audit-libs"/> + <package name="augeas-lenses"/> <package name="autofs"/> <package name="autoyast2-installation"/> - <package name="avahi"/> + <package name="awesfx"/> <package name="b43-fwcutter"/> <package name="bash"/> - <package name="bash-doc"/> <package name="bc"/> <package name="bind-libs"/> <package name="bind-utils"/> - <package name="binutils"/> - <package name="blktrace"/> <package name="bluez-firmware"/> - <package name="bluez-libs"/> - <package name="bluez-utils"/> <package name="bootsplash"/> <package name="bootsplash-branding-openSUSE"/> <package name="branding-openSUSE"/> + <package name="btrfsprogs"/> + <package name="bundle-lang-common-de"/> <package name="bundle-lang-common-en"/> - <package name="bundle-lang-kde-en"/> <package name="bzip2"/> <package name="cabextract"/> <package name="cairo"/> - <package name="cdparanoia"/> - <package name="cdrdao"/> <package name="cdrkit-cdrtools-compat"/> - <package name="check"/> <package name="checkmedia"/> - <package name="chmlib"/> <package name="cifs-mount"/> - <package name="clucene-core"/> - <package name="compiz"/> - <package name="compiz-fusion-plugins-main"/> - <package name="compiz-kde4"/> - <package name="compiz-manager"/> - <package name="compizconfig-settings-manager"/> + <package name="command-not-found"/> + <package name="compcache"/> + <package name="compcache-kmp-desktop"/> <package name="coreutils"/> <package name="cpio"/> <package name="cpp"/> - <package name="cpp43"/> + <package name="cpp44"/> <package name="cracklib"/> <package name="cracklib-dict-full"/> + <package name="crda"/> <package name="cron"/> <package name="cryptsetup"/> <package name="cups"/> <package name="cups-client"/> + <package name="cups-drivers"/> <package name="cups-libs"/> <package name="curl"/> <package name="cyrus-sasl"/> <package name="cyrus-sasl-crammd5"/> <package name="cyrus-sasl-digestmd5"/> + <package name="cyrus-sasl-gssapi"/> <package name="cyrus-sasl-plain"/> - <package name="cyrus-sasl-saslauthd"/> <package name="db-utils"/> <package name="dbus-1"/> <package name="dbus-1-glib"/> - <package name="dbus-1-qt3"/> <package name="dbus-1-x11"/> - <package name="dcraw"/> <package name="ddrescue"/> <package name="dejavu"/> <package name="deltarpm"/> <package name="desktop-data-openSUSE"/> <package name="desktop-file-utils"/> <package name="device-mapper"/> - <package name="dhcp"/> - <package name="dhcp-client"/> <package name="dhcpcd"/> <package name="dialog"/> <package name="diffutils"/> - <package name="digikam"/> - <package name="digikamimageplugins"/> <package name="dirmngr"/> + <package name="dmidecode"/> <package name="dmraid"/> <package name="dosfstools"/> <package name="dvb"/> - <package name="dvd+rw-tools"/> <package name="e2fsprogs"/> <package name="eject"/> - <package name="enchant"/> + <package name="elfutils"/> + <package name="esound-daemon"/> + <package name="espeak"/> <package name="ethtool"/> - <package name="expat"/> - <package name="extragear-plasma"/> <package name="fam"/> <package name="fbset"/> - <package name="fftw3"/> <package name="file"/> <package name="filesystem"/> <package name="fillup"/> @@ -183,65 +159,53 @@ <package name="fuse"/> <package name="gawk"/> <package name="gconf2"/> - <package name="gconf2-branding-openSUSE"/> - <package name="gdb"/> + <package name="gd"/> <package name="gdbm"/> <package name="genisoimage"/> <package name="gettext-runtime"/> <package name="gfxboot"/> <package name="gfxboot-branding-openSUSE"/> - <package name="ggz"/> - <package name="ggz-client-libs"/> <package name="ghostscript-fonts-std"/> <package name="ghostscript-library"/> - <package name="ghostscript-omni"/> <package name="ghostscript-x11"/> - <package name="giflib"/> <package name="glib2"/> <package name="glib2-branding-openSUSE"/> <package name="glibc"/> + <package name="glibc-32bit"/> <package name="glibc-locale"/> - <package name="glitz"/> - <package name="gmp"/> - <package name="gnokii"/> + <package name="glibc-locale-32bit"/> + <package name="gnome-icon-theme"/> <package name="gnome-keyring"/> <package name="gnome-vfs2"/> <package name="gnutls"/> <package name="gpart"/> <package name="gpg2"/> - <package name="gpgme"/> <package name="gpm"/> <package name="grep"/> <package name="groff"/> <package name="grub"/> - <package name="gstreamer-0_10"/> - <package name="gstreamer-0_10-plugins-base"/> - <package name="gstreamer-0_10-plugins-good"/> <package name="gtk2"/> <package name="gtk2-branding-openSUSE"/> + <package name="gtk2-engine-murrine"/> <package name="gtk2-engines"/> - <package name="gtk2-theme-openSUSE"/> + <package name="gtk2-metatheme-gilouche"/> + <package name="gtk2-metatheme-sonar"/> <package name="gvfs"/> <package name="gvfs-backends"/> <package name="gvfs-fuse"/> <package name="gzip"/> <package name="hal"/> - <package name="hal-palm"/> - <package name="hal-resmgr"/> <package name="hdparm"/> <package name="hicolor-icon-theme"/> - <package name="hunspell"/> - <package name="hunspell-tools"/> <package name="hwinfo"/> <package name="icedax"/> <package name="icewm"/> <package name="icewm-lite"/> <package name="ifnteuro"/> <package name="ifplugd"/> - <package name="imlib2"/> - <package name="imlib2-loaders"/> <package name="info"/> <package name="info2html"/> + <package name="initviocons"/> <package name="input-utils"/> <package name="insserv"/> <package name="iproute2"/> @@ -249,359 +213,293 @@ <package name="iputils"/> <package name="ipw-firmware"/> <package name="irda"/> - <package name="iwl3945-ucode"/> - <package name="iwl4965-ucode"/> + <package name="irqbalance"/> + <package name="iw"/> <package name="jfsutils"/> - <package name="jpackage-utils"/> - <package name="jpeg"/> - <package name="k3b"/> - <package name="kaffeine"/> <package name="kbd"/> - <package name="kde4-akregator"/> - <package name="kde4-ark"/> - <package name="kde4-dolphin"/> - <package name="kde4-filesystem"/> - <package name="kde4-gwenview"/> - <package name="kde4-kaddressbook"/> - <package name="kde4-kcalc"/> - <package name="kde4-kcm_gtk"/> - <package name="kde4-kcolorchooser"/> - <package name="kde4-kdm"/> - <package name="kde4-kdm-branding-openSUSE"/> - <package name="kde4-kdnssd"/> - <package name="kde4-keditbookmarks"/> - <package name="kde4-kfind"/> - <package name="kde4-kgamma"/> - <package name="kde4-kget"/> - <package name="kde4-kgpg"/> - <package name="kde4-kio_audiocd"/> - <package name="kde4-kio_iso"/> - <package name="kde4-kio_kamera"/> - <package name="kde4-kio_sysinfo"/> - <package name="kde4-kio_sysinfo-branding-openSUSE"/> - <package name="kde4-kmahjongg"/> - <package name="kde4-kmail"/> - <package name="kde4-kmines"/> - <package name="kde4-kmix"/> - <package name="kde4-knewsticker"/> - <package name="kde4-knotes"/> - <package name="kde4-konqueror"/> - <package name="kde4-konqueror-plugins"/> - <package name="kde4-konsole"/> - <package name="kde4-kontact"/> - <package name="kde4-kopete"/> - <package name="kde4-korganizer"/> - <package name="kde4-kpat"/> - <package name="kde4-kpilot"/> - <package name="kde4-krdc"/> - <package name="kde4-kreversi"/> - <package name="kde4-krfb"/> - <package name="kde4-kscd"/> - <package name="kde4-ksnapshot"/> - <package name="kde4-ksudoku"/> - <package name="kde4-kwalletmanager"/> - <package name="kde4-kwin"/> - <package name="kde4-kwrite"/> - <package name="kde4-okular"/> - <package name="kde4-opensuse-updater"/> - <package name="kdeartwork4-screensaver"/> - <package name="kdebase3-runtime"/> - <package name="kdebase4"/> - <package name="kdebase4-libkonq"/> - <package name="kdebase4-nsplugin"/> - <package name="kdebase4-openSUSE"/> - <package name="kdebase4-openSUSE-lang"/> - <package name="kdebase4-runtime"/> - <package name="kdebase4-session"/> - <package name="kdebase4-workspace"/> - <package name="kdebase4-workspace-branding-openSUSE"/> - <package name="kdebase4-workspace-plasmoids"/> - <package name="kdebluetooth"/> - <package name="kdegames4"/> - <package name="kdegames4-carddecks-default"/> - <package name="kdelibs3"/> - <package name="kdelibs3-default-style"/> - <package name="kdelibs4"/> - <package name="kdelibs4-core"/> - <package name="kdemultimedia4"/> - <package name="kdepim3"/> - <package name="kdepim4"/> - <package name="kdepim4-wizards"/> - <package name="kdepimlibs4"/> - <package name="kdetv"/> - <package name="kernel-default"/> + <package name="kernel-desktop"/> + <package name="kernel-firmware"/> + <package name="keyutils"/> <package name="keyutils-libs"/> - <package name="kinternet"/> - <package name="kipi-plugins"/> <package name="klogd"/> - <package name="konversation"/> <package name="kpartx"/> - <package name="kpowersave"/> <package name="krb5"/> <package name="krb5-client"/> - <package name="krecord"/> - <package name="kscpm"/> - <package name="ktorrent"/> - <package name="ldapcpplib"/> + <package name="lcms"/> <package name="less"/> - <package name="libFLAC++6"/> <package name="libFLAC8"/> + <package name="libHX18"/> + <package name="libMagickCore2"/> + <package name="libMagickWand2"/> + <package name="libSDL-1_2-0"/> <package name="libacl"/> + <package name="libadns1"/> <package name="libaio"/> - <package name="libakonadi4"/> - <package name="libakonadiprotocolinternals0"/> - <package name="libao"/> <package name="libapparmor1"/> <package name="libarchive2"/> <package name="libart_lgpl"/> + <package name="libasm1"/> <package name="libasound2"/> + <package name="libatasmart4"/> <package name="libatk-1_0-0"/> <package name="libattr"/> + <package name="libaugeas0"/> <package name="libavahi-client3"/> <package name="libavahi-common3"/> - <package name="libavahi-core5"/> <package name="libavahi-glib1"/> <package name="libblkid1"/> <package name="libblocxx6"/> + <package name="libbluetooth3"/> <package name="libbonobo"/> + <package name="libbonoboui"/> + <package name="libbonoboui-lang"/> <package name="libbz2-1"/> <package name="libcap2"/> - <package name="libcdio7"/> + <package name="libcdio10"/> + <package name="libcdio_cdda0"/> + <package name="libcdio_paranoia0"/> + <package name="libcloog0"/> <package name="libcom_err2"/> - <package name="libcompizconfig"/> + <package name="libcryptsetup0"/> <package name="libcurl4"/> <package name="libdaemon0"/> <package name="libdb-4_5"/> - <package name="libdbus-1-qt3-0"/> - <package name="libdjvulibre15"/> <package name="libdns_sd"/> <package name="libdrm"/> - <package name="libdvdread3"/> - <package name="libenchant1"/> + <package name="libdw1"/> + <package name="libeggdbus-1-0"/> + <package name="libelf1"/> + <package name="liberation-fonts"/> <package name="libesd0"/> - <package name="libevent"/> + <package name="libevent-1_4-2"/> <package name="libexif"/> - <package name="libexiv2-2"/> <package name="libexpat1"/> <package name="libext2fs2"/> + <package name="libfprint0"/> + <package name="libfreebl3"/> <package name="libfuse2"/> - <package name="libgcc43"/> + <package name="libgcc44"/> <package name="libgcrypt11"/> - <package name="libggz2"/> + <package name="libgdu0"/> <package name="libgimpprint"/> <package name="libgio-2_0-0"/> <package name="libgio-fam"/> <package name="libglade2"/> <package name="libglib-2_0-0"/> <package name="libgmodule-2_0-0"/> + <package name="libgmp3"/> + <package name="libgmpxx4"/> <package name="libgnome"/> - <package name="libgnutls-extra26"/> + <package name="libgnomecanvas"/> + <package name="libgnomecanvas-lang"/> + <package name="libgnomeui"/> + <package name="libgnomeui-lang"/> <package name="libgnutls26"/> <package name="libgobject-2_0-0"/> + <package name="libgomp44"/> <package name="libgpg-error0"/> - <package name="libgpgme11"/> <package name="libgphoto2"/> - <package name="libgpod-tools"/> - <package name="libgpod3"/> - <package name="libgsf-1-114"/> <package name="libgssglue1"/> - <package name="libgstinterfaces-0_10-0"/> - <package name="libgstreamer-0_10-0"/> <package name="libgthread-2_0-0"/> + <package name="libgudev-1_0-0"/> <package name="libgvfscommon0"/> - <package name="libical0"/> - <package name="libicu"/> <package name="libidl"/> <package name="libidn"/> + <package name="libiw30"/> <package name="libjasper"/> <package name="libjpeg"/> - <package name="libkcal"/> - <package name="libkcal2"/> - <package name="libkcddb4"/> - <package name="libkcompactdisc4"/> - <package name="libkdcraw3"/> - <package name="libkde4"/> - <package name="libkdecore4"/> - <package name="libkdegames4"/> - <package name="libkdepim4"/> - <package name="libkdepimlibs4"/> - <package name="libkexiv2-3"/> - <package name="libkipi0"/> - <package name="libkonq4"/> <package name="libksba"/> - <package name="libktnef1"/> - <package name="liblazy1"/> <package name="liblcms1"/> - <package name="libltdl-3"/> + <package name="libldap-2_4-2"/> + <package name="libldapcpp1"/> + <package name="libltdl7"/> + <package name="liblua5_1"/> + <package name="liblzma0"/> + <package name="liblzo2-2"/> <package name="libmng"/> - <package name="libmpcdec5"/> <package name="libmpfr1"/> - <package name="libmtp7"/> - <package name="libmusicbrainz4"/> + <package name="libmysqlclient_r16"/> <package name="libncurses5"/> - <package name="libneon27"/> + <package name="libncurses5-32bit"/> + <package name="libncurses6"/> <package name="libnetpbm10"/> - <package name="libnjb"/> - <package name="libnjb5"/> <package name="libnl"/> <package name="libnscd"/> - <package name="libofa0"/> + <package name="libnsssharedhelper0"/> + <package name="libnuma1"/> <package name="libogg0"/> - <package name="liboil"/> <package name="libopenct1"/> <package name="libopensc2"/> <package name="libopenssl0_9_8"/> - <package name="libpcap"/> - <package name="libpisock9"/> + <package name="libpcap1"/> + <package name="libpciaccess0"/> + <package name="libpcre0"/> + <package name="libpixman-1-0"/> <package name="libpng12-0"/> - <package name="libpoppler-qt4-3"/> - <package name="libpoppler3"/> - <package name="libqca2"/> - <package name="libqimageblitz4"/> + <package name="libpolkit0"/> + <package name="libpoppler5"/> + <package name="libpopt0"/> + <package name="libppl7"/> + <package name="libppl_c2"/> + <package name="libproxy0"/> + <package name="libproxy0-config-gnome"/> + <package name="libproxy0-pacrunner-mozjs"/> + <package name="libproxy0-wpad-dns"/> + <package name="libpth20"/> + <package name="libpulse0"/> + <package name="libpython2_6-1_0"/> <package name="libqt4"/> <package name="libqt4-qt3support"/> <package name="libqt4-sql"/> + <package name="libqt4-sql-mysql"/> <package name="libqt4-x11"/> - <package name="libraptor1"/> - <package name="librasqal0"/> - <package name="libreadline5"/> - <package name="libredland0"/> + <package name="libreadline6"/> <package name="libreiserfs"/> <package name="librpcsecgss"/> - <package name="libsamplerate"/> + <package name="libselinux1"/> <package name="libsmbclient0"/> <package name="libsmbios-bin"/> - <package name="libsmbios-libs"/> + <package name="libsmbios2"/> <package name="libsndfile"/> - <package name="libsoprano4"/> - <package name="libsoup"/> <package name="libsoup-2_4-1"/> - <package name="libspeex"/> <package name="libsqlite3-0"/> - <package name="libstdc++43"/> - <package name="libstrigi0"/> + <package name="libstdc++44"/> + <package name="libstorage"/> <package name="libtalloc1"/> <package name="libtasn1"/> <package name="libtasn1-3"/> - <package name="libtdb0"/> - <package name="libtheora0"/> - <package name="libthinkfinger"/> + <package name="libtdb1"/> <package name="libtiff3"/> - <package name="libtunepimp"/> - <package name="libtunepimp5"/> - <package name="libusb"/> + <package name="libtirpc1"/> + <package name="libudev0"/> + <package name="libusb-0_1-4"/> + <package name="libusb-1_0-0"/> <package name="libuuid1"/> - <package name="libvisual"/> - <package name="libvisual-plugins"/> - <package name="libvolume_id"/> <package name="libvorbis"/> - <package name="libwavpack1"/> <package name="libwbclient0"/> - <package name="libwpd-0_8-8"/> - <package name="libwpg-0_1-1"/> - <package name="libwps-0_1-1"/> <package name="libx86"/> + <package name="libx86emu1"/> <package name="libxcrypt"/> - <package name="libxklavier"/> - <package name="libxklavier12"/> <package name="libxml2"/> - <package name="libxslt"/> <package name="libzio"/> - <package name="libzip1"/> <package name="libzypp"/> <package name="licenses"/> - <package name="lilo"/> <package name="limal"/> + <package name="limal-ca-mgm"/> + <package name="limal-ca-mgm-perl"/> + <package name="limal-nfs-server"/> + <package name="limal-nfs-server-perl"/> <package name="limal-perl"/> <package name="linux-atm-lib"/> + <package name="linux32"/> <package name="login"/> <package name="logrotate"/> <package name="lomoco"/> + <package name="lsb-release"/> + <package name="lsof"/> + <package name="lsscsi"/> <package name="lukemftp"/> <package name="lvm2"/> - <package name="lzo"/> <package name="mailx"/> <package name="man"/> + <package name="manufacturer-PPDs"/> <package name="master-boot-code"/> + <package name="mc"/> <package name="mdadm"/> <package name="memtest86+"/> + <package name="mhash"/> <package name="microcode_ctl"/> <package name="mingetty"/> <package name="mkinitrd"/> <package name="module-init-tools"/> <package name="mozilla-nspr"/> <package name="mozilla-nss"/> - <package name="mozilla-xulrunner190"/> - <package name="mozilla-xulrunner190-gnomevfs"/> - <package name="mozilla-xulrunner190-translations"/> <package name="mpt-firmware"/> - <package name="myspell-american"/> + <package name="mtools"/> + <package name="multipath-tools"/> + <package name="nano"/> <package name="ncurses-utils"/> <package name="ndiswrapper"/> - <package name="ndiswrapper-kmp-default"/> + <package name="ndiswrapper-kmp-desktop"/> <package name="net-tools"/> <package name="netcat"/> <package name="netcfg"/> <package name="netpbm"/> <package name="nfs-client"/> <package name="nfsidmap"/> - <package name="nscd"/> - <package name="nss-mdns"/> <package name="nss_ldap"/> <package name="ntfs-3g"/> <package name="ntfsprogs"/> <package name="ntp"/> + <package name="numactl"/> <package name="numlockx"/> <package name="obex-data-server"/> - <package name="obexftp"/> + <package name="openSUSE-build-key"/> <package name="openSUSE-release"/> - <package name="openct"/> <package name="openldap2-client"/> <package name="openobex"/> - <package name="opensc"/> <package name="openslp"/> <package name="openssh"/> <package name="openssh-askpass"/> <package name="openssl"/> <package name="openssl-certs"/> - <package name="opensuse-codecs-installer"/> + <package name="opensuse-manuals_en"/> <package name="orbit2"/> - <package name="oxygen-icon-theme"/> <package name="pam"/> <package name="pam-config"/> <package name="pam-modules"/> + <package name="pam_apparmor"/> + <package name="pam_fp"/> <package name="pam_krb5"/> <package name="pam_ldap"/> - <package name="pam_thinkfinger"/> + <package name="pam_mount"/> <package name="pango"/> <package name="parted"/> + <package name="patterns-openSUSE-apparmor"/> + <package name="patterns-openSUSE-base"/> + <package name="patterns-openSUSE-enhanced_base"/> + <package name="patterns-openSUSE-fonts"/> + <package name="patterns-openSUSE-sw_management"/> + <package name="patterns-openSUSE-x11"/> + <package name="patterns-openSUSE-x11_yast"/> + <package name="patterns-openSUSE-yast2_basis"/> + <package name="patterns-openSUSE-yast2_install_wf"/> <package name="pciutils"/> <package name="pciutils-ids"/> <package name="pcmciautils"/> <package name="pcre"/> - <package name="pcsc-lite"/> <package name="perl"/> <package name="perl-Bootloader"/> + <package name="perl-Business-ISBN"/> + <package name="perl-Business-ISBN-Data"/> <package name="perl-Config-Crontab"/> <package name="perl-Crypt-SSLeay"/> <package name="perl-Crypt-SmbHash"/> <package name="perl-DBD-SQLite"/> <package name="perl-DBI"/> + <package name="perl-Digest-HMAC"/> <package name="perl-Digest-MD4"/> <package name="perl-Digest-SHA1"/> <package name="perl-File-Tail"/> + <package name="perl-GD"/> + <package name="perl-GD-Barcode"/> <package name="perl-HTML-Parser"/> <package name="perl-HTML-Tagset"/> <package name="perl-Net-Daemon"/> + <package name="perl-NetxAP"/> <package name="perl-Parse-RecDescent"/> <package name="perl-PlRPC"/> <package name="perl-RPC-XML"/> <package name="perl-TermReadKey"/> <package name="perl-TimeDate"/> <package name="perl-URI"/> + <package name="perl-WWW-Curl"/> <package name="perl-X500-DN"/> - <package name="perl-XML-Bare"/> + <package name="perl-XML-LibXML"/> + <package name="perl-XML-LibXML-Common"/> + <package name="perl-XML-NamespaceSupport"/> <package name="perl-XML-Parser"/> + <package name="perl-XML-SAX"/> <package name="perl-XML-Simple"/> <package name="perl-XML-Writer"/> <package name="perl-XML-XPath"/> @@ -611,43 +509,35 @@ <package name="perl-libwww-perl"/> <package name="permissions"/> <package name="pinentry"/> - <package name="pinentry-qt"/> <package name="pkg-config"/> - <package name="plasma-theme-aya"/> + <package name="pm-profiler"/> <package name="pm-utils"/> - <package name="pmtools"/> - <package name="poppler-data"/> + <package name="polkit"/> + <package name="polkit-default-privs"/> <package name="poppler-tools"/> - <package name="popt"/> - <package name="portmap"/> <package name="postfix"/> - <package name="powersave"/> - <package name="powersave-libs"/> <package name="ppp"/> <package name="pptp"/> <package name="preload"/> + <package name="preload-kmp-desktop"/> <package name="procps"/> <package name="psmisc"/> - <package name="pth"/> + <package name="pullin-flash-player"/> + <package name="pullin-msttf-fonts"/> <package name="pwdutils"/> <package name="python"/> - <package name="python-cairo"/> - <package name="python-compizconfig"/> - <package name="python-gobject2"/> - <package name="python-gtk"/> - <package name="python-numeric"/> + <package name="python-base"/> + <package name="python-satsolver"/> <package name="python-xml"/> - <package name="qlogic-firmware"/> - <package name="qt3"/> - <package name="qtcurve-gtk2"/> - <package name="qtcurve-kde"/> <package name="quota"/> <package name="recode"/> <package name="reiserfs"/> <package name="release-notes-openSUSE"/> - <package name="resmgr"/> + <package name="rpcbind"/> <package name="rpm"/> - <package name="ruby"/> + <package name="rpm-python"/> + <package name="rsync"/> + <package name="rsyslog"/> <package name="satsolver-tools"/> <package name="sax2"/> <package name="sax2-gui"/> @@ -655,75 +545,65 @@ <package name="sax2-libsax"/> <package name="sax2-libsax-perl"/> <package name="sax2-tools"/> + <package name="sbl"/> + <package name="scout"/> <package name="scpm"/> - <package name="scsi"/> <package name="sed"/> <package name="setserial"/> + <package name="sg3_utils"/> <package name="shared-mime-info"/> - <package name="siga"/> - <package name="simple-ccsm"/> <package name="slang"/> + <package name="smartmontools"/> + <package name="smp_utils"/> <package name="smpppd"/> - <package name="soprano"/> <package name="splashy"/> - <package name="sqlite2"/> - <package name="sqlite3"/> - <package name="startup-notification"/> + <package name="splashy-branding-openSUSE"/> <package name="strace"/> - <package name="strigi"/> <package name="sudo"/> - <package name="sumf"/> - <package name="suse-build-key"/> <package name="suseRegister"/> <package name="susehelp"/> + <package name="susehelp_de"/> <package name="susehelp_en"/> <package name="suspend"/> <package name="sysconfig"/> <package name="sysfsutils"/> - <package name="syslog-ng"/> + <package name="systemtap-runtime"/> <package name="sysvinit"/> - <package name="taglib"/> <package name="tar"/> <package name="tcpd"/> <package name="terminfo-base"/> <package name="tightvnc"/> <package name="timezone"/> <package name="translation-update"/> + <package name="translation-update-de"/> <package name="udev"/> <package name="ulimit"/> + <package name="unrar"/> + <package name="unscd"/> <package name="unzip"/> <package name="update-alternatives"/> + <package name="usbutils"/> <package name="utempter"/> <package name="util-linux"/> - <package name="uuid-runtime"/> - <package name="v4l-conf"/> <package name="vim"/> <package name="vim-base"/> - <package name="vorbis-tools"/> + <package name="virtualbox-ose-kmp-desktop"/> <package name="w3m"/> <package name="wdiff"/> <package name="wget"/> + <package name="wireless-regdb"/> <package name="wireless-tools"/> - <package name="wlan-ng-kmp-default"/> <package name="wodim"/> <package name="wpa_supplicant"/> <package name="wvdial"/> <package name="wvstreams"/> <package name="x11-input-fujitsu"/> - <package name="x11-input-synaptics"/> <package name="x11-input-wacom"/> - <package name="x11-input-wacom-tools"/> <package name="x11-tools"/> - <package name="xalan-j2"/> - <package name="xaw3d"/> <package name="xdg-menu"/> <package name="xdg-utils"/> - <package name="xerces-j2"/> - <package name="xerces-j2-xml-apis"/> + <package name="xfsdump"/> <package name="xfsprogs"/> - <package name="xgl"/> - <package name="xgl-hardware-list"/> - <package name="xine-lib"/> <package name="xinetd"/> <package name="xkeyboard-config"/> <package name="xorg-x11"/> @@ -731,7 +611,6 @@ <package name="xorg-x11-driver-input"/> <package name="xorg-x11-driver-video"/> <package name="xorg-x11-driver-video-radeonhd"/> - <package name="xorg-x11-driver-video-unichrome"/> <package name="xorg-x11-driver-virtualbox-ose"/> <package name="xorg-x11-fonts-core"/> <package name="xorg-x11-libICE"/> @@ -754,19 +633,22 @@ <package name="xorg-x11-libxcb"/> <package name="xorg-x11-libxkbfile"/> <package name="xorg-x11-server"/> + <package name="xorg-x11-xauth"/> <package name="xstroke"/> <package name="xterm"/> - <package name="xvkbd"/> + <package name="xz"/> <package name="yast2"/> <package name="yast2-add-on"/> <package name="yast2-apparmor"/> <package name="yast2-backup"/> <package name="yast2-bootloader"/> + <package name="yast2-branding-openSUSE"/> <package name="yast2-control-center"/> <package name="yast2-control-center-qt"/> <package name="yast2-core"/> <package name="yast2-country"/> <package name="yast2-country-data"/> + <package name="yast2-dbus-client"/> <package name="yast2-fingerprint-reader"/> <package name="yast2-firewall"/> <package name="yast2-hardware-detection"/> @@ -785,11 +667,13 @@ <package name="yast2-ncurses-pkg"/> <package name="yast2-network"/> <package name="yast2-nfs-client"/> + <package name="yast2-nfs-common"/> <package name="yast2-nis-client"/> <package name="yast2-ntp-client"/> <package name="yast2-online-update"/> <package name="yast2-online-update-frontend"/> <package name="yast2-packager"/> + <package name="yast2-packager-webpin"/> <package name="yast2-pam"/> <package name="yast2-perl-bindings"/> <package name="yast2-pkg-bindings"/> @@ -798,6 +682,7 @@ <package name="yast2-qt"/> <package name="yast2-qt-pkg"/> <package name="yast2-registration"/> + <package name="yast2-registration-branding-openSUSE"/> <package name="yast2-repair"/> <package name="yast2-restore"/> <package name="yast2-runlevel"/> @@ -808,12 +693,10 @@ <package name="yast2-slp"/> <package name="yast2-sound"/> <package name="yast2-storage"/> - <package name="yast2-storage-lib"/> <package name="yast2-sudo"/> - <package name="yast2-support"/> <package name="yast2-sysconfig"/> <package name="yast2-theme-openSUSE"/> - <package name="yast2-theme-openSUSE-Oxygen"/> + <package name="yast2-trans-de"/> <package name="yast2-trans-en_US"/> <package name="yast2-trans-stats"/> <package name="yast2-transfer"/> @@ -821,25 +704,24 @@ <package name="yast2-tv"/> <package name="yast2-update"/> <package name="yast2-users"/> + <package name="yast2-vm"/> <package name="yast2-x11"/> <package name="yast2-xml"/> <package name="yast2-ycp-ui-bindings"/> - <package name="yauap"/> <package name="yp-tools"/> <package name="ypbind"/> <package name="zd1211-firmware"/> + <package name="zip"/> <package name="zisofs-tools"/> <package name="zlib"/> - <package name="zvbi"/> <package name="zypper"/>  </packages> <packages type="bootstrap"> <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="kernel-default"/> - <package name="udev"/> <package name="bundle-lang-common-en"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-livecd-x11"/> </packages> <split> <temporary> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/src/dialogs.ycp new/yast2-product-creator-2.19.1/src/dialogs.ycp --- old/yast2-product-creator-2.19.0/src/dialogs.ycp 2009-12-22 15:39:55.000000000 +0100 +++ new/yast2-product-creator-2.19.1/src/dialogs.ycp 2009-12-22 15:49:36.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: dialogs.ycp 57551 2009-06-12 12:39:59Z jsuchome $ + * $Id: dialogs.ycp 60181 2009-12-22 14:49:28Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.0/src/kiwi_dialogs.ycp new/yast2-product-creator-2.19.1/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.19.0/src/kiwi_dialogs.ycp 2009-09-04 15:23:41.000000000 +0200 +++ new/yast2-product-creator-2.19.1/src/kiwi_dialogs.ycp 2010-01-06 14:18:55.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: kiwi_dialogs.ycp 58530 2009-09-04 13:23:24Z jsuchome $ + * $Id: kiwi_dialogs.ycp 60238 2010-01-06 13:18:38Z jsuchome $ */ { textdomain "product-creator"; @@ -1132,11 +1132,8 @@ kiwi_task = Kiwi::kiwi_task; - // path to definition of openSUSE live CD (used if kiwi-config-openSUSE-kde, - // resp. kiwi-config-openSUSE-gnome is installed) - string kiwi_dir = "/usr/share/openSUSE/kiwi-config-kde"; - if (!FileUtils::Exists (kiwi_dir)) - kiwi_dir = "/usr/share/openSUSE/kiwi-config-gnome"; + // path to definition of openSUSE live CD (used if kiwi-config-openSUSE is installed) + string kiwi_dir = "/usr/share/openSUSE-kiwi/livecd-x11"; // read the information from the base product integer src_id = ProductCreator::checkProductDependency (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-pkg-bindings for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at Thu Jan 7 13:06:33 CET 2010. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2009-10-16 13:33:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-01-06 20:14:54.000000000 +0100 @@ -1,0 +2,25 @@ +Wed Jan 6 17:50:26 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - always return "transact_by" flag, + Pkg::PkgApplReset() - do not reset "transact_by" flag for + non-transacting resolvables (bnc#450786, bnc#471340) +- 2.19.0 + +------------------------------------------------------------------- +Thu Dec 3 08:19:45 UTC 2009 - lslezak(a)suse.cz + +- return more details when a service refresh fails (bnc#558049) + +------------------------------------------------------------------- +Tue Dec 1 15:28:04 UTC 2009 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return product file and it's + upgrades section for `product resolvables (bnc#559554) + +------------------------------------------------------------------- +Tue Nov 24 09:40:12 UTC 2009 - lslezak(a)suse.cz + +- use zypp::Url::schemeIsRemote() instead of the hardcoded protocol + list (bnc#551661) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pkg-bindings-2.18.11.tar.bz2 New: ---- yast2-pkg-bindings-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.E5wMIc/_old 2010-01-07 13:06:23.000000000 +0100 +++ /var/tmp/diff_new_pack.E5wMIc/_new 2010-01-07 13:06:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.18.11) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.18.11 +Version: 2.19.0 Release: 1 License: GPL Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.18.11.tar.bz2 +Source0: yast2-pkg-bindings-2.19.0.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools @@ -39,7 +39,7 @@ from the pkg-bindings sources. %prep -%setup -n yast2-pkg-bindings-2.18.11 +%setup -n yast2-pkg-bindings-2.19.0 # build only documentation, ignore all other directories echo "doc" > SUBDIRS ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.E5wMIc/_old 2010-01-07 13:06:23.000000000 +0100 +++ /var/tmp/diff_new_pack.E5wMIc/_new 2010-01-07 13:06:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-pkg-bindings (Version 2.18.11) +# spec file for package yast2-pkg-bindings (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,13 +19,13 @@ Name: yast2-pkg-bindings -Version: 2.18.11 +Version: 2.19.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.18.11.tar.bz2 +Source0: yast2-pkg-bindings-2.19.0.tar.bz2 Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 6.10.0 # new GPG callbacks @@ -37,7 +37,7 @@ library in YaST2. %prep -%setup -n yast2-pkg-bindings-2.18.11 +%setup -n yast2-pkg-bindings-2.19.0 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS ++++++ yast2-pkg-bindings-2.18.11.tar.bz2 -> yast2-pkg-bindings-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/Makefile.in new/yast2-pkg-bindings-2.19.0/Makefile.in --- old/yast2-pkg-bindings-2.18.11/Makefile.in 2009-10-16 13:29:38.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/Makefile.in 2010-01-06 20:14:25.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -458,7 +458,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -483,7 +483,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -650,7 +650,8 @@ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -693,17 +694,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/VERSION new/yast2-pkg-bindings-2.19.0/VERSION --- old/yast2-pkg-bindings-2.18.11/VERSION 2009-10-16 13:28:07.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/VERSION 2010-01-06 20:12:35.000000000 +0100 @@ -1 +1 @@ -2.18.11 +2.19.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/aclocal.m4 new/yast2-pkg-bindings-2.19.0/aclocal.m4 --- old/yast2-pkg-bindings-2.18.11/aclocal.m4 2009-10-16 13:29:33.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/aclocal.m4 2010-01-06 20:14:20.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -34,7 +34,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/config.guess new/yast2-pkg-bindings-2.19.0/config.guess --- old/yast2-pkg-bindings-2.18.11/config.guess 2009-10-16 13:29:37.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/config.guess 2010-01-06 20:14:25.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2009-11-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner <per(a)bothner.com>. -# Please send patches to <config-patches(a)gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to <config-patches(a)gnu.org> and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues… me=`echo "$0" | sed -e 's,.*/,,'` @@ -180,7 +180,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -213,19 +213,19 @@ exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in @@ -290,13 +290,13 @@ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 + echo m68k-${VENDOR}-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo ${UNAME_MACHINE}-${VENDOR}-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo ${UNAME_MACHINE}-${VENDOR}-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -311,7 +311,7 @@ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos + echo arm-${VENDOR}-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp @@ -343,6 +343,9 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -416,7 +419,7 @@ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-${VENDOR}-mint${UNAME_RELEASE} exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} @@ -666,7 +669,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -727,9 +730,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo ${UNAME_MACHINE}-${VENDOR}-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo ${UNAME_MACHINE}-${VENDOR}-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -789,19 +792,19 @@ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-${VENDOR}-bsdi${UNAME_RELEASE} exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) case ${UNAME_MACHINE} in pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -817,21 +820,24 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) + *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} + authenticamd | genuineintel | EM64T) + echo x86_64-${VENDOR}-interix${UNAME_RELEASE} exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-${VENDOR}-interix${UNAME_RELEASE} exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -842,25 +848,39 @@ echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin + echo x86_64-${VENDOR}-cygwin exit ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + echo powerpcle-${VENDOR}-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -883,6 +903,17 @@ frv:Linux:*:*) echo frv-${VENDOR}-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; @@ -892,77 +923,33 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-${VENDOR}-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-${VENDOR}-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-${VENDOR}-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} - exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-${VENDOR}-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-${VENDOR}-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -972,8 +959,11 @@ *) echo hppa-${VENDOR}-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-${VENDOR}-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-${VENDOR}-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-${VENDOR}-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -996,66 +986,6 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1084,7 +1014,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1192,7 +1122,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1285,6 +1215,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/config.sub new/yast2-pkg-bindings-2.19.0/config.sub --- old/yast2-pkg-bindings-2.18.11/config.sub 2009-10-16 13:29:37.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/config.sub 2010-01-06 20:14:25.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to <config-patches(a)gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;… + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -149,10 +152,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -281,6 +287,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -288,13 +295,14 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -337,7 +345,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -365,7 +373,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* \ + | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -374,6 +382,7 @@ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -467,6 +476,10 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -719,6 +732,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1240,6 +1256,9 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1260,9 +1279,9 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1283,7 +1302,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1613,7 +1632,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/configure new/yast2-pkg-bindings-2.19.0/configure --- old/yast2-pkg-bindings-2.18.11/configure 2009-10-16 13:29:35.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/configure 2010-01-06 20:14:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.18.11. +# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.19.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.18.11' -PACKAGE_STRING='yast2-pkg-bindings 2.18.11' +PACKAGE_VERSION='2.19.0' +PACKAGE_STRING='yast2-pkg-bindings 2.19.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1541,7 +1541,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-pkg-bindings 2.18.11 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.19.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1613,7 +1613,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.18.11:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.19.0:";; esac cat <<\_ACEOF @@ -1727,7 +1727,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.18.11 +yast2-pkg-bindings configure 2.19.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1741,7 +1741,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.18.11, which was +It was created by yast2-pkg-bindings $as_me 2.19.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2721,7 +2721,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.18.11' + VERSION='2.19.0' cat >>confdefs.h <<_ACEOF @@ -2843,7 +2843,7 @@ -VERSION="2.18.11" +VERSION="2.19.0" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -5381,8 +5381,8 @@ -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -17327,7 +17327,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.18.11, which was +This file was extended by yast2-pkg-bindings $as_me 2.19.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17390,7 +17390,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-pkg-bindings config.status 2.18.11 +yast2-pkg-bindings config.status 2.19.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/configure.in new/yast2-pkg-bindings-2.19.0/configure.in --- old/yast2-pkg-bindings-2.18.11/configure.in 2009-10-16 13:29:20.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/configure.in 2010-01-06 20:14:08.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.18.11, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.19.0, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.11" +VERSION="2.19.0" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/doc/Makefile.in new/yast2-pkg-bindings-2.19.0/doc/Makefile.in --- old/yast2-pkg-bindings-2.18.11/doc/Makefile.in 2009-10-16 13:29:37.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/doc/Makefile.in 2010-01-06 20:14:25.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -366,7 +366,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -391,7 +391,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/doc/autodocs/Makefile.in new/yast2-pkg-bindings-2.19.0/doc/autodocs/Makefile.in --- old/yast2-pkg-bindings-2.18.11/doc/autodocs/Makefile.in 2009-10-16 13:29:38.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/doc/autodocs/Makefile.in 2010-01-06 20:14:25.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/ltmain.sh new/yast2-pkg-bindings-2.19.0/ltmain.sh --- old/yast2-pkg-bindings-2.18.11/ltmain.sh 2009-10-16 13:29:28.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/ltmain.sh 2010-01-06 20:14:15.000000000 +0100 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6b # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION=2.2.6b TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -116,15 +116,15 @@ : ${CP="cp -f"} : ${ECHO="echo"} -: ${EGREP="/usr/bin/grep -E"} -: ${FGREP="/usr/bin/grep -F"} -: ${GREP="/usr/bin/grep"} +: ${EGREP="/bin/grep -E"} +: ${FGREP="/bin/grep -F"} +: ${GREP="/bin/grep"} : ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/opt/local/bin/gsed"} +: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/ltversion.m4 new/yast2-pkg-bindings-2.19.0/ltversion.m4 --- old/yast2-pkg-bindings-2.18.11/ltversion.m4 2009-10-16 13:29:28.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/ltversion.m4 2010-01-06 20:14:15.000000000 +0100 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/src/Makefile.in new/yast2-pkg-bindings-2.19.0/src/Makefile.in --- old/yast2-pkg-bindings-2.18.11/src/Makefile.in 2009-10-16 13:29:38.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/src/Makefile.in 2010-01-06 20:14:25.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/src/Network.cc new/yast2-pkg-bindings-2.19.0/src/Network.cc --- old/yast2-pkg-bindings-2.18.11/src/Network.cc 2008-11-07 11:13:02.000000000 +0100 +++ new/yast2-pkg-bindings-2.19.0/src/Network.cc 2009-11-24 10:38:16.000000000 +0100 @@ -60,10 +60,5 @@ bool PkgFunctions::remoteRepo(const zypp::Url &url) { // is it a remote repository? - std::string scheme(zypp::str::toLower(url.getScheme())); - - y2debug("Repository schema: %s", scheme.c_str()); - - return (scheme == "ftp" || scheme == "http" || scheme == "https" || scheme == "nfs" - || scheme == "smb"); + return url.schemeIsRemote(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/src/Package.cc new/yast2-pkg-bindings-2.19.0/src/Package.cc --- old/yast2-pkg-bindings-2.18.11/src/Package.cc 2009-07-10 12:38:02.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/src/Package.cc 2010-01-06 20:12:12.000000000 +0100 @@ -1727,7 +1727,10 @@ for_(it, proxy.byKindBegin<T>(), proxy.byKindEnd<T>()) { zypp::ui::Selectable::Ptr s = (*it); - if (s) s->theObj().status().resetTransact(level); + if (s && (level == zypp::ResStatus::USER || s->theObj().status().transacts())) + { + s->theObj().status().resetTransact(level); + } } } @@ -2355,7 +2358,7 @@ // get the package files zypp::Package::FileList files( refpkg->filelist() ); - y2milestone("The reference package has %zd files", files.size()); + y2milestone("The reference package has %d files", files.size()); std::string product_file; zypp::str::smatch what; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.19.0/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-2.18.11/src/Resolvable_Properties.cc 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/src/Resolvable_Properties.cc 2010-01-06 20:13:59.000000000 +0100 @@ -19,7 +19,7 @@ */ /* - File: $Id: Resolvable_Properties.cc 57028 2009-04-29 10:58:09Z lslezak $ + File: $Id: Resolvable_Properties.cc 60247 2010-01-06 19:13:58Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Resolvable properties Namespace: Pkg @@ -45,6 +45,8 @@ #include <zypp/Dep.h> #include <zypp/sat/LocaleSupport.h> +#include <zypp/parser/ProductFileReader.h> +#include <zypp/base/Regex.h> /** @builtin ResolvableProperties @@ -89,6 +91,13 @@ + "description" + "display_name" + "short_name" + + "product_file" -> string : product file (full file name with target root prefix) + + "upgrades" -> list<map> : parsed data from the product file (upgrades section) + + "name" -> string + + "summary" -> string + + "repository" -> string : URL path + + "notify" -> boolean + + "status" -> string `patch keys: + "interactive" + "reboot_needed" @@ -184,14 +193,12 @@ if (status.isToBeInstalled()) { stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else if (status.isInstalled() || status.isSatisfied()) { if (status.isToBeUninstalled()) { stat = "removed"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else { @@ -203,6 +210,8 @@ stat = "available"; } + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + info->add(YCPString("status"), YCPSymbol(stat)); // is the resolvable locked? (Locked or Taboo in the UI) @@ -370,6 +379,75 @@ info->add(YCPString("replaces"), rep_prods); } + + std::string product_file; + + // add reference file in /etc/products.d + if (status.isInstalled()) + { + product_file = (_target_root + "/etc/products.d/" + product->referenceFilename()).asString(); + y2milestone("Parsing product file %s", product_file.c_str()); + const zypp::parser::ProductFileData productFileData = zypp::parser::ProductFileReader::scanFile(product_file); + + YCPList upgrade_list; + + for_( upit, productFileData.upgrades().begin(), productFileData.upgrades().end() ) + { + const zypp::parser::ProductFileData::Upgrade & upgrade( *upit ); + + YCPMap upgrades; + upgrades->add(YCPString("name"), YCPString(upgrade.name())); + upgrades->add(YCPString("summary"), YCPString(upgrade.summary())); + upgrades->add(YCPString("repository"), YCPString(upgrade.repository())); + upgrades->add(YCPString("notify"), YCPBoolean(upgrade.notify())); + upgrades->add(YCPString("status"), YCPString(upgrade.status())); + + upgrade_list->add(upgrades); + } + + info->add(YCPString("upgrades"), upgrade_list); + } + else + { + // get the package + zypp::sat::Solvable refsolvable = product->referencePackage(); + + if (refsolvable != zypp::sat::Solvable::noSolvable) + { + // create a package pointer from the SAT solvable + zypp::Package::Ptr refpkg(zypp::make<zypp::Package>(refsolvable)); + + if (refpkg) + { + // get the package files + zypp::Package::FileList files( refpkg->filelist() ); + y2milestone("The reference package has %d files", files.size()); + + zypp::str::smatch what; + const zypp::str::regex product_file_regex("^/etc/products\\.d/(.*\\.prod)$"); + + // find the product file + for_(iter, files.begin(), files.end()) + { + if (zypp::str::regex_match(*iter, what, product_file_regex)) + { + product_file = what[1]; + break; + } + } + } + } + } + + if (product_file.empty()) + { + y2warning("The product file has not been found"); + } + else + { + y2milestone("Found product file %s", product_file.c_str()); + info->add(YCPString("product_file"), YCPString(product_file)); + } } // pattern specific info else if ( req_kind == "pattern" ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/src/Source_Load.cc new/yast2-pkg-bindings-2.19.0/src/Source_Load.cc --- old/yast2-pkg-bindings-2.18.11/src/Source_Load.cc 2009-06-16 15:58:04.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/src/Source_Load.cc 2009-12-03 09:21:00.000000000 +0100 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Load.cc 57592 2009-06-16 13:58:03Z lslezak $ + File: $Id: Source_Load.cc 59922 2009-12-03 08:20:59Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for initializing the package manager Namespace: Pkg @@ -105,7 +105,9 @@ { // service refresh is not fatal, let's continue y2error ("Error in service refresh: %s", excpt.asString().c_str()); - _last_error.setLastError(ExceptionAsString(excpt)); + // error message, service name and URL is appened at the end of the string + _last_error.setLastError(std::string(_("Error refreshing service")) + " " + srv_it->name() + " (" + + srv_it->url().asString() + "):\n\n" + ExceptionAsString(excpt)); success = false; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.18.11/testsuite/Makefile.in new/yast2-pkg-bindings-2.19.0/testsuite/Makefile.in --- old/yast2-pkg-bindings-2.18.11/testsuite/Makefile.in 2009-10-16 13:29:38.000000000 +0200 +++ new/yast2-pkg-bindings-2.19.0/testsuite/Makefile.in 2010-01-06 20:14:25.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-packager for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Thu Jan 7 13:06:03 CET 2010. -------- --- yast2-packager/yast2-packager.changes 2009-12-14 15:28:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2010-01-06 20:11:15.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Jan 6 17:48:18 UTC 2010 - lslezak(a)suse.cz + +- do not reselect patterns which have been deselected by user + (bnc#450786, bnc#471340) +- 2.19.2 + +------------------------------------------------------------------- +Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz + +- Fixed accepting/declining the multilicense agreement. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.19.1.tar.bz2 New: ---- yast2-packager-2.19.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.aPiSSG/_old 2010-01-07 13:05:57.000000000 +0100 +++ /var/tmp/diff_new_pack.aPiSSG/_new 2010-01-07 13:05:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-packager (Version 2.19.1) +# spec file for package yast2-packager (Version 2.19.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: yast2-packager -Version: 2.19.1 +Version: 2.19.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.19.1.tar.bz2 +Source0: yast2-packager-2.19.2.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -79,7 +79,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.19.1 +%setup -n yast2-packager-2.19.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.19.1.tar.bz2 -> yast2-packager-2.19.2.tar.bz2 ++++++ ++++ 5453 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.19.1/VERSION new/yast2-packager-2.19.2/VERSION --- old/yast2-packager-2.19.1/VERSION 2009-12-08 14:00:14.000000000 +0100 +++ new/yast2-packager-2.19.2/VERSION 2010-01-06 20:09:39.000000000 +0100 @@ -1 +1 @@ -2.19.1 +2.19.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.19.1/configure.in new/yast2-packager-2.19.2/configure.in --- old/yast2-packager-2.19.1/configure.in 2009-07-31 12:53:46.000000000 +0200 +++ new/yast2-packager-2.19.2/configure.in 2010-01-06 20:10:38.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.18.9, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.19.2, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.9" +VERSION="2.19.2" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.19.1/missing new/yast2-packager-2.19.2/missing --- old/yast2-packager-2.19.1/missing 2009-07-31 12:53:51.000000000 +0200 +++ new/yast2-packager-2.19.2/missing 2010-01-06 20:10:43.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.19.1/src/clients/inst_kickoff.ycp new/yast2-packager-2.19.2/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.19.1/src/clients/inst_kickoff.ycp 2009-06-24 12:53:07.000000000 +0200 +++ new/yast2-packager-2.19.2/src/clients/inst_kickoff.ycp 2010-01-05 13:45:45.000000000 +0100 @@ -5,7 +5,7 @@ * * Purpose: Do various tasks before starting with installation of rpms. * - * $Id: inst_kickoff.ycp 52946 2008-11-05 16:17:47Z locilka $ + * $Id: inst_kickoff.ycp 60099 2009-12-14 15:44:01Z aschnell $ * */ @@ -317,10 +317,6 @@ } } - // special logging function for Rendivm - void eat2minestrone (string entry) { - y2milestone (entry); - } /** * Load all network modules. The package sysconfig requires this during diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.19.1/src/modules/Packages.ycp new/yast2-packager-2.19.2/src/modules/Packages.ycp --- old/yast2-packager-2.19.1/src/modules/Packages.ycp 2009-06-24 12:53:07.000000000 +0200 +++ new/yast2-packager-2.19.2/src/modules/Packages.ycp 2010-01-06 20:10:26.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 56846 2009-04-20 10:21:38Z locilka $ + * $Id: Packages.ycp 60245 2010-01-06 19:10:25Z lslezak $ */ { @@ -1649,7 +1649,15 @@ { y2milestone ("Selecting system patterns %1", system_patterns); foreach (string p, system_patterns, { - Pkg::ResolvableInstall (p, `pattern); + map prop = Pkg::ResolvableProperties(p, `pattern, "")[0]:$[]; + if (prop["status"]:nil == `available && prop["transact_by"]:nil == `user) + { + y2milestone("Ignoring deselected pattern '%1'", p); + } + else + { + Pkg::ResolvableInstall (p, `pattern); + } }); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.19.1/src/modules/ProductLicense.ycp new/yast2-packager-2.19.2/src/modules/ProductLicense.ycp --- old/yast2-packager-2.19.1/src/modules/ProductLicense.ycp 2009-12-14 15:27:57.000000000 +0100 +++ new/yast2-packager-2.19.2/src/modules/ProductLicense.ycp 2010-01-05 13:45:45.000000000 +0100 @@ -139,7 +139,7 @@ return license_file; } -global term GetLicenseContent (string lic_lang, map <string, string> & licenses) { +global term GetLicenseContent (string lic_lang, map <string, string> & licenses, string id) { string license_file = WhichLicenceFile (lic_lang, licenses); string license_text = (string) SCR::Read(.target.string, license_file); @@ -152,13 +152,13 @@ // License is HTML (or RichText) if (regexpmatch(license_text, "</.*>")) - rt = `MinWidth (80, `RichText(`id (`welcome_text), + rt = `MinWidth (80, `RichText(`id (sformat("welcome_text_%1", id)), license_text )); // License is plain text // details in BNC #449188 else - rt = `MinWidth (80, `RichText(`id (`welcome_text), + rt = `MinWidth (80, `RichText(`id (sformat("welcome_text_%1", id)), "<pre>" + String::EscapeTags (license_text) + "</pre>" )); @@ -171,7 +171,7 @@ term GetLicenseDialogTerm (list<string> languages, string license_language, map <string, string> & licenses, string id) { string license_text = ""; - term rt = GetLicenseContent (license_language, licenses); + term rt = GetLicenseContent (license_language, licenses, id); // bug #204791, no more "languages.ycp" client map<string,list> lang_names_orig = Language::GetLanguagesMap (false); @@ -285,29 +285,22 @@ } } -/** - * Displays License with Help and ( ) Yes / ( ) No radio buttons - * @param string file with the license - */ -void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { +term GetLicenseDialog (list<string> languages, string license_language, map <string, string> & licenses, string id, boolean spare_space) { map display = UI::GetDisplayInfo(); integer space = display["TextMode"]:true ? 1 : 3; - // dialog caption - string caption = _("License Agreement"); - term license_buttons = `VBox ( - `VSpacing (2), - `RadioButtonGroup(`id(`eula), + `VSpacing ((spare_space ? 0:2)), + `RadioButtonGroup(`id (sformat ("eula_%1", id)), `HBox( `HSpacing (2*space), `VBox( - `Left(`RadioButton(`id(`yes), + `Left(`RadioButton(`id (sformat("yes_%1", id)), `opt(`notify), // radio button _("&Yes, I Agree to the License Agreement") )), - `Left(`RadioButton(`id(`no), + `Left(`RadioButton(`id (sformat("no_%1", id)), `opt(`notify), // radio button _("N&o, I Do Not Agree") @@ -318,8 +311,8 @@ ) ); - term contents = `VBox ( - `VSpacing (1), + return `VBox ( + `VSpacing ((spare_space ? 0:1)), `HBox ( `HSpacing (2*space), GetLicenseDialogTerm (languages, license_language, licenses, id), @@ -333,7 +326,7 @@ : `Empty() ), - `VSpacing(1), + `VSpacing((spare_space ? 0.5 : 1)), `HBox ( `HSpacing (2*space), (license_file_print != nil ? @@ -351,22 +344,35 @@ ), `HSpacing (2*space) ), - `VSpacing (1) + `VSpacing ((spare_space ? 0:1)) ); +} +string GetLicenseDialogHelp () { // help text - string help = _("Read the license agreement carefully and select + return _("Read the license agreement carefully and select one of the available options. If you do not agree to the license agreement, the configuration will be aborted. "); +} + +/** + * Displays License with Help and ( ) Yes / ( ) No radio buttons + * @param string file with the license + */ +void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map <string, string> & licenses, string id) { + // dialog caption + string caption = _("License Agreement"); + + term contents = GetLicenseDialog (languages, license_language, licenses, id, false); // If acceptance is not needed, there's no need to disable the button // by default boolean default_next_button_state = (AcceptanceNeeded (id) ? false : true); - Wizard::SetContents(caption, contents, help, + Wizard::SetContents(caption, contents, GetLicenseDialogHelp(), back, default_next_button_state); - + Wizard::SetTitleIcon ("yast-license"); Wizard::SetFocusToNextButton(); } @@ -771,7 +777,7 @@ lic_lang = (string) UI::QueryWidget (`id (sformat ("license_language_%1", id)), `Value); term rp_id = `id (sformat ("license_contents_rp_%1", id)); if (UI::WidgetExists (rp_id)) { - UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses)); + UI::ReplaceWidget (rp_id, GetLicenseContent (lic_lang, licenses, id)); } else { y2error ("No such widget: %1", rp_id); } @@ -784,8 +790,10 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) { + y2milestone ("License %1 does not need to be accepted", one_license_id); return; + } eula_id = sformat ("eula_%1", one_license_id); if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { @@ -794,7 +802,10 @@ } // All licenses have to be accepted - if ((symbol) UI::QueryWidget(`id (eula_id), `CurrentButton) != `yes) { + string license_accepted = (string) UI::QueryWidget (`id (eula_id), `CurrentButton); + y2milestone ("License %1 accepted: %2", eula_id, license_accepted); + + if (! regexpmatch (license_accepted, "^yes_")) { accepted = false; break; } @@ -816,9 +827,9 @@ y2error ("Widget %1 does not exist", eula_id); } - symbol current_button = (symbol) UI::QueryWidget(`id (eula_id), `CurrentButton); + string current_button = (string) UI::QueryWidget(`id (eula_id), `CurrentButton); // license have to be accepted or declined - if (current_button != `yes && current_button != `no) { + if (current_button == nil) { y2warning ("License %1 hasn't been accepted or declined", eula_id); ret = false; break; @@ -840,7 +851,7 @@ ret = `language; // bugzilla #303828 // disabled next button unless yes/no is selected - } else if (ret == `yes || ret == `no) { + } else if (is (ret, string) && (regexpmatch (tostring(ret), "^yes_") || regexpmatch (tostring(ret), "^no_"))) { if (AllLicensesAcceptedOrDeclined()) Wizard::EnableNextButton(); } @@ -1017,6 +1028,129 @@ return ret; } +/** + * Ask user to confirm license agreement + * @param src_id integer repository to get the license from. + * If set to 'nil', the license is considered to belong to a base product + * @param list <string> dirs - directories to look for the licenses + * @param patterns a list of patterns for the files, regular expressions + * with %1 for the language + * @param boolean enable_back sets the back_button status + * @param boolean base_product defines whether it is a base or add-on product + * true means base product, false add-on product + * @param require_agreement means that even if the license (or the very same license) + * has been already accepetd, ask user to accept it again (because of 'going back' + * in the installation proposal). + */ +global symbol AskLicensesAgreement (list <string> dirs, + list<string> patterns, string action, boolean enable_back, + boolean base_product, boolean require_agreement) +{ + if (dirs == nil || dirs == []) { + y2error ("No directories: %1", dirs); + // error message + Report::Error ("Internal Error: No license to show"); + return `auto; + } + + symbol init_ret = nil; + + if (init_ret == `auto || init_ret == `accepted) { + y2milestone ("Returning %1", init_ret); + return init_ret; + } + + boolean created_new_dialog = false; + + // #459391 + // If a progress is running open another dialog + if (Progress::IsRunning()) { + y2milestone ("Some progress is running, opening new dialog for license..."); + Wizard::OpenNextBackDialog(); + created_new_dialog = true; + } + + // dialog caption + string caption = _("License Agreement"); + + list <string> license_idents = []; + + // initial loop + symbol ret = nil; + + list <map <string, string> > licenses = []; + integer counter = -1; + term contents = `VBox(); + // If acceptance is not needed, there's no need to disable the button + // by default + boolean default_next_button_state = true; + + foreach (string dir, dirs, { + counter = counter + 1; + licenses[counter] = $[]; + + lic_lang = ""; + list <string> available_langs = []; + string license_ident = ""; + map <string, string> tmp_licenses = $[]; + + symbol init_ret = InitLicenseData (nil, dir, tmp_licenses, available_langs, require_agreement, license_ident, dir); + + if (license_ident != nil) + license_idents = add (license_idents, license_ident); + + term license_term = GetLicenseDialog (available_langs, lic_lang, tmp_licenses, dir, true); + if (license_term == nil) { + y2error ("Oops, license term is: %1", license_term); + } else { + contents = add (contents, license_term); + } + + // Display info as a popup if exists + if (info_file != nil) + InstShowInfo::show_info_txt (info_file); + + licenses[counter] = tmp_licenses; + + if (AcceptanceNeeded (dir)) + default_next_button_state = false; + }); + + SCR::Write (.target.ycp, "/tmp/a", contents); + Wizard::SetContents(caption, contents, GetLicenseDialogHelp(), + enable_back, default_next_button_state); + + Wizard::SetTitleIcon ("yast-license"); + Wizard::SetFocusToNextButton(); + + // set timeout for autoinstallation + // bugzilla #206706 + if (Mode::autoinst()) { + y2milestone("AutoYaST: License has been accepted automatically"); + ret = `accepted; + } else { + map <string, string> tmp_licenses = $[]; + ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + y2milestone ("Dialog ret: %1", ret); + } + + // store already accepted license IDs + if (ret == `accepted) { + foreach (string license_ident, license_idents, { + LicenseHasBeenAccepted (license_ident); + }); + } + + CleanUpLicense (tmpdir); + + // bugzilla #303922 + if (created_new_dialog || !Stage::initial()) { + Wizard::CloseDialog(); + } + + return ret; +} + global symbol AskAddOnLicenseAgreement (integer src_id) { return AskLicenseAgreement (src_id, "", license_patterns, @@ -1091,7 +1225,7 @@ symbol init_ret = InitLicenseData (nil /* base product */, "", licenses, available_langs, true, license_ident, tostring (src_id)); - term rt = GetLicenseContent (lic_lang, licenses); + term rt = GetLicenseContent (lic_lang, licenses, tostring (src_id)); UI::ReplaceWidget (`id (replace_point_ID), rt); string id = tostring (src_id); @@ -1109,11 +1243,15 @@ return true; } -global symbol AskInstalledLicenseAgreement (string directory, - list<string> patterns, string action, string id) -{ - return AskLicenseAgreement (nil, directory, patterns, action, false, true, false, id); +global symbol AskInstalledLicenseAgreement (string directory, string action) { + // patterns are hard-coded + return AskLicenseAgreement (nil, directory, [], action, false, true, false, directory); } +// FATE #306295: More licenses in one dialog +global symbol AskInstalledLicensesAgreement (list <string> directories, string action) { + // patterns are hard-coded + return AskLicensesAgreement (directories, [], action, false, true, false); +} } // EOF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-http-server for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at Thu Jan 7 13:05:54 CET 2010. -------- --- yast2-http-server/yast2-http-server.changes 2009-06-22 07:45:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-http-server/yast2-http-server.changes 2010-01-04 17:48:59.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Jan 4 17:43:07 CET 2010 - mzugec(a)suse.cz + +- determine vhost by HostIP instead of ServerName (bnc#567027) +- 2.19.0 + +------------------------------------------------------------------- +Tue Jul 7 12:26:55 CEST 2009 - mzugec(a)suse.cz + +- defined proxy_ajp in HTTPModules.pm (bnc#518816) +- 2.18.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-http-server-2.18.8.tar.bz2 New: ---- yast2-http-server-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.ynNPhl/_old 2010-01-07 13:05:48.000000000 +0100 +++ /var/tmp/diff_new_pack.ynNPhl/_new 2010-01-07 13:05:48.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-http-server (Version 2.18.8) +# spec file for package yast2-http-server (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,13 +19,13 @@ Name: yast2-http-server -Version: 2.18.8 +Version: 2.19.0 Release: 1 -License: GPL -Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-http-server-2.18.8.tar.bz2 +Source0: yast2-http-server-2.19.0.tar.bz2 Prefix: /usr +Group: System/YaST +License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) @@ -38,7 +38,7 @@ configuration. %prep -%setup -n yast2-http-server-2.18.8 +%setup -n yast2-http-server-2.19.0 %build %{prefix}/bin/y2tool y2autoconf @@ -48,7 +48,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-http-server-2.18.8.tar.bz2 -> yast2-http-server-2.19.0.tar.bz2 ++++++ ++++ 3415 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.18.8/VERSION new/yast2-http-server-2.19.0/VERSION --- old/yast2-http-server-2.18.8/VERSION 2009-04-23 18:39:21.000000000 +0200 +++ new/yast2-http-server-2.19.0/VERSION 2010-01-04 17:43:04.000000000 +0100 @@ -1 +1 @@ -2.18.8 +2.19.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.18.8/autodocs-ycp.ami new/yast2-http-server-2.19.0/autodocs-ycp.ami --- old/yast2-http-server-2.18.8/autodocs-ycp.ami 2009-06-22 07:45:02.000000000 +0200 +++ new/yast2-http-server-2.19.0/autodocs-ycp.ami 2010-01-04 17:47:35.000000000 +0100 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.18.8/configure.in new/yast2-http-server-2.19.0/configure.in --- old/yast2-http-server-2.18.8/configure.in 2009-06-22 07:45:02.000000000 +0200 +++ new/yast2-http-server-2.19.0/configure.in 2010-01-04 17:47:35.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-http-server dnl -dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.18.8, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.19.0, http://bugs.opensuse.org/, yast2-http-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.8" +VERSION="2.19.0" RPMNAME="yast2-http-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.18.8/missing new/yast2-http-server-2.19.0/missing --- old/yast2-http-server-2.18.8/missing 2009-06-22 07:45:06.000000000 +0200 +++ new/yast2-http-server-2.19.0/missing 2010-01-04 17:47:41.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.18.8/src/YaPI/HTTPD.pm new/yast2-http-server-2.19.0/src/YaPI/HTTPD.pm --- old/yast2-http-server-2.18.8/src/YaPI/HTTPD.pm 2009-04-23 18:39:21.000000000 +0200 +++ new/yast2-http-server-2.19.0/src/YaPI/HTTPD.pm 2010-01-04 17:38:38.000000000 +0100 @@ -528,6 +528,8 @@ } else { $vhost_files->{$servername} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; } + + $self->validateNVH(); } @@ -572,25 +574,27 @@ $self->deleteVH($hostid); $self->createVH($hostid, $data, $params); - $self->validateNVH(); +# $self->validateNVH(); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } - my @tmp_data=(); - foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); - } - $vhost_files->{main}{DATA} = \@tmp_data; + + my @tmp_data=(); + foreach my $row (@{$vhost_files->{main}{DATA}}){ + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + } + $vhost_files->{main}{DATA} = \@tmp_data; - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-http-server-2.18.8/src/YaPI/HTTPDModules.pm new/yast2-http-server-2.19.0/src/YaPI/HTTPDModules.pm --- old/yast2-http-server-2.18.8/src/YaPI/HTTPDModules.pm 2009-03-06 16:50:29.000000000 +0100 +++ new/yast2-http-server-2.19.0/src/YaPI/HTTPDModules.pm 2009-07-21 07:30:44.000000000 +0200 @@ -559,6 +559,13 @@ "values" => [ "On", "Off", "Full", "Block" ] } ] }, + 'proxy_ajp' => { + summary => __("AJP support module for mod_proxy"), + packages => [], + default => 0, + requires => "proxy", + position => 395, + }, 'proxy_connect' => { summary => __("mod_proxy extension for CONNECT request handling"), packages => [], ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-country for openSUSE:Factory
by root＠Hilbert.suse.de 07 Jan '10

07 Jan '10

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at Thu Jan 7 13:05:34 CET 2010. -------- --- yast2-country/yast2-country.changes 2009-12-04 14:20:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2010-01-04 10:53:34.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 4 10:47:25 CET 2010 - jsuchome(a)suse.cz + +- returned keyboard desktop file, adapted help text (bnc#560713) +- 2.19.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.19.3.tar.bz2 New: ---- yast2-country-2.19.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.FTqQhz/_old 2010-01-07 13:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.FTqQhz/_new 2010-01-07 13:05:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-country (Version 2.19.3) +# spec file for package yast2-country (Version 2.19.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: yast2-country -Version: 2.19.3 +Version: 2.19.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.19.3.tar.bz2 +Source0: yast2-country-2.19.4.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -73,7 +73,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.19.3 +%setup -n yast2-country-2.19.4 %build %{prefix}/bin/y2tool y2autoconf @@ -120,6 +120,7 @@ /usr/share/YaST2/schema/autoyast/rnc/*.rnc %{prefix}/share/applications/YaST2/yast-language.desktop %{prefix}/share/applications/YaST2/timezone.desktop +%{prefix}/share/applications/YaST2/keyboard.desktop %attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.yapi.*.policy %package data ++++++ yast2-country-2.19.3.tar.bz2 -> yast2-country-2.19.4.tar.bz2 ++++++ ++++ 9568 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.19.3/VERSION new/yast2-country-2.19.4/VERSION --- old/yast2-country-2.19.3/VERSION 2009-12-04 14:13:20.000000000 +0100 +++ new/yast2-country-2.19.4/VERSION 2010-01-04 10:50:13.000000000 +0100 @@ -1 +1 @@ -2.19.3 +2.19.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.19.3/configure.in new/yast2-country-2.19.4/configure.in --- old/yast2-country-2.19.3/configure.in 2009-07-31 08:14:12.000000000 +0200 +++ new/yast2-country-2.19.4/configure.in 2010-01-04 10:50:22.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-country dnl -dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-country, 2.18.15, http://bugs.opensuse.org/, yast2-country) +AC_INIT(yast2-country, 2.19.4, http://bugs.opensuse.org/, yast2-country) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.15" +VERSION="2.19.4" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.19.3/keyboard/src/dialogs.ycp new/yast2-country-2.19.4/keyboard/src/dialogs.ycp --- old/yast2-country-2.19.3/keyboard/src/dialogs.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.19.4/keyboard/src/dialogs.ycp 2010-01-04 10:51:42.000000000 +0100 @@ -10,7 +10,7 @@ * Summary: * Dialogs for keyboard configuration * - * $Id: dialogs.ycp 50253 2008-08-21 10:40:18Z jsuchome $ + * $Id: dialogs.ycp 60212 2010-01-04 09:51:26Z jsuchome $ */ { textdomain "country"; @@ -208,24 +208,36 @@ // help text for keyboard screen (header) string help_text = _(" -<big>Keyboard Configuration</big>") + +<big>Keyboard Configuration</big>"); - // help text for keyboard screen - _(" + if (Stage::initial () || Stage::firstboot ()) + { + + help_text = help_text + + // help text for keyboard screen (installation) + _(" Choose the Keyboard Layout to use for installation and in the installed system. Test the layout in Test. For advanced options, such as repeat rate and delay, select Expert Settings. "); - - // general help trailer - help_text = help_text + _(" + // general help trailer + help_text = help_text + _(" If unsure, use the default values already selected. "); + } + else + help_text = help_text + + // help text for keyboard screen (installation) + _(" +Choose the Keyboard Layout to use in the system. +For advanced options, such as repeat rate and delay, select Expert Settings. +Find more options as well as more layouts in the keyboard layout tool of your desktop environment. +"); // Screen title for keyboard screen - Wizard::SetContents ( _("Keyboard Configuration"), contents, help_text, + Wizard::SetContents ( _("System Keyboard Configuration"), contents, help_text, args["enable_back"]:true, args["enable_next"]:true); Wizard::SetDesktopIcon("keyboard"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.19.3/missing new/yast2-country-2.19.4/missing --- old/yast2-country-2.19.3/missing 2009-07-31 08:14:16.000000000 +0200 +++ new/yast2-country-2.19.4/missing 2010-01-04 10:50:27.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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