Hello community, here is the log from the commit of package yast2-update checked in at Thu Dec 7 21:44:19 CET 2006. -------- --- yast2-update/yast2-update.changes 2006-11-10 09:00:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2006-12-05 14:11:29.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 10:42:16 CET 2006 - locilka@suse.cz + +- Installation Media (update) proposal: using key "label" instead + of "productname", which is used as a fallback now (#225256). +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-update-2.14.7.tar.bz2 New: ---- update.tgz yast2-update-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.hyINBv/_old 2006-12-07 21:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.hyINBv/_new 2006-12-07 21:43:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.14.7) +# spec file for package yast2-update (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-update -Version: 2.14.7 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.14.7.tar.bz2 +Source0: yast2-update-2.15.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml Requires: yast2 yast2-installation yast2-storage yast2-packager @@ -40,7 +40,7 @@ Jiri Srain <jsrain@suse.cz> %prep -%setup -n yast2-update-2.14.7 +%setup -n yast2-update-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,10 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog -n yast2-update +* Mon Dec 04 2006 - locilka@suse.cz +- Installation Media (update) proposal: using key "label" instead + of "productname", which is used as a fallback now (#225256). +- 2.15.0 * Fri Nov 10 2006 - locilka@suse.cz - Removing `ignore button for now (#148105, comments #22-#28). - 2.14.7 ++++++ yast2-update-2.14.7.tar.bz2 -> yast2-update-2.15.0.tar.bz2 ++++++ ++++ 5361 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-update-2.14.7/Makefile.am new/yast2-update-2.15.0/Makefile.am --- old/yast2-update-2.14.7/Makefile.am 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/Makefile.am 2006-12-05 14:11:59.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common 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-update-2.14.7/Makefile.am.common new/yast2-update-2.15.0/Makefile.am.common --- old/yast2-update-2.14.7/Makefile.am.common 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/Makefile.am.common 2006-12-05 14:11:59.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-update-2.14.7/VERSION new/yast2-update-2.15.0/VERSION --- old/yast2-update-2.14.7/VERSION 2006-11-10 09:00:37.000000000 +0100 +++ new/yast2-update-2.15.0/VERSION 2006-12-05 14:10:06.000000000 +0100 @@ -1 +1 @@ -2.14.7 +2.15.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-update-2.14.7/autodocs-ycp.ami new/yast2-update-2.15.0/autodocs-ycp.ami --- old/yast2-update-2.14.7/autodocs-ycp.ami 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/autodocs-ycp.ami 2006-12-05 14:11:59.000000000 +0100 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $ +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc 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-update-2.14.7/configure.in new/yast2-update-2.15.0/configure.in --- old/yast2-update-2.14.7/configure.in 2006-11-03 15:23:37.000000000 +0100 +++ new/yast2-update-2.15.0/configure.in 2006-12-05 14:11:59.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.14.4, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.15.0, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.4" +VERSION="2.15.0" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) ( cd src/config; ln -sf update.xml update.glade ) 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-update-2.14.7/src/modules/Update.ycp new/yast2-update-2.15.0/src/modules/Update.ycp --- old/yast2-update-2.14.7/src/modules/Update.ycp 2006-11-09 13:31:46.000000000 +0100 +++ new/yast2-update-2.15.0/src/modules/Update.ycp 2006-12-04 10:47:39.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 34202 2006-11-09 12:31:44Z locilka $ + * $Id: Update.ycp 34713 2006-12-04 09:47:38Z locilka $ */ { module "Update"; @@ -308,7 +308,8 @@ return false; } - updateVersion["name"] = new_product["productname"]:"?"; + // bugzilla #225256, use "label" first, then a "productname" + updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; updateVersion["version"] = new_product["productversion"]:"?"; fill_version_map (updateVersion); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org