Hello community,
here is the log from the commit of package yast2-update
checked in at Wed May 3 14:44:52 CEST 2006.
--------
--- yast2-update/yast2-update.changes 2006-04-26 19:05:54.000000000 +0200
+++ STABLE/yast2-update/yast2-update.changes 2006-05-03 14:23:31.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 3 14:18:50 CEST 2006 - jsrain@suse.cz
+
+- fixed selecting product during update (#172164)
+- 2.13.26
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.13.25.tar.bz2
New:
----
yast2-update-2.13.26.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.IKU1gs/_old 2006-05-03 14:44:45.000000000 +0200
+++ /var/tmp/diff_new_pack.IKU1gs/_new 2006-05-03 14:44:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.13.25)
+# spec file for package yast2-update (Version 2.13.26)
#
# 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.13.25
-Release: 1
+Version: 2.13.26
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.13.25.tar.bz2
+Source0: yast2-update-2.13.26.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
@@ -39,7 +39,7 @@
Arvin Schnell
%prep
-%setup -n yast2-update-2.13.25
+%setup -n yast2-update-2.13.26
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Wed May 03 2006 - jsrain@suse.cz
+- fixed selecting product during update (#172164)
+- 2.13.26
* Wed Apr 26 2006 - jsrain@suse.de
- fixed update proposal with patterns (#168297)
- 2.13.25
++++++ yast2-update-2.13.25.tar.bz2 -> yast2-update-2.13.26.tar.bz2 ++++++
++++ 1613 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.13.25/Makefile.am new/yast2-update-2.13.26/Makefile.am
--- old/yast2-update-2.13.25/Makefile.am 2006-04-26 19:07:28.000000000 +0200
+++ new/yast2-update-2.13.26/Makefile.am 2006-05-03 14:22:51.000000000 +0200
@@ -6,8 +6,7 @@
# (Edit ./SUBDIRS instead)
#
-#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+PREFIX = /usr
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -31,10 +30,6 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
-# where devtools instal m4 snippets
-# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(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
cmp -s $< $@ || cp -f $< $@
@@ -62,8 +57,12 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
+# pkg-config
+# if a package does not have its own pc, copy the generic one
+$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
+ test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here (not anymore!)
+# because the prerequisite is made here
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
$(RPMNAME).pc: $(RPMNAME).pc.in
@@ -154,7 +153,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +198,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
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.13.25/Makefile.am.common new/yast2-update-2.13.26/Makefile.am.common
--- old/yast2-update-2.13.25/Makefile.am.common 2006-04-26 19:07:28.000000000 +0200
+++ new/yast2-update-2.13.26/Makefile.am.common 2006-05-03 14:22:51.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
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.13.25/VERSION new/yast2-update-2.13.26/VERSION
--- old/yast2-update-2.13.25/VERSION 2006-04-26 18:44:44.000000000 +0200
+++ new/yast2-update-2.13.26/VERSION 2006-05-03 14:20:17.000000000 +0200
@@ -1 +1 @@
-2.13.25
+2.13.26
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.13.25/configure.in new/yast2-update-2.13.26/configure.in
--- old/yast2-update-2.13.25/configure.in 2006-04-26 19:07:27.000000000 +0200
+++ new/yast2-update-2.13.26/configure.in 2006-05-03 14:22:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.13.25, http://www.suse.de/feedback, yast2-update)
+AC_INIT(yast2-update, 2.13.26, http://www.suse.de/feedback, 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.13.25"
+VERSION="2.13.26"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain "
@@ -110,8 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -138,10 +138,6 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
-AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
-if test "$YCPC" = "false"; then
- AC_MSG_ERROR([ycpc is not installed])
-fi
( 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.13.25/src/clients/update_proposal.ycp new/yast2-update-2.13.26/src/clients/update_proposal.ycp
--- old/yast2-update-2.13.25/src/clients/update_proposal.ycp 2006-04-26 19:02:42.000000000 +0200
+++ new/yast2-update-2.13.26/src/clients/update_proposal.ycp 2006-05-03 14:11:23.000000000 +0200
@@ -89,7 +89,6 @@
y2milestone ("No base selection found, but patterns found...");
Packages::using_patterns = true;
}
- Packages::SelectProduct();
if (!Update::did_init2)
{
@@ -140,6 +139,7 @@
}
}
+ Packages::SelectProduct();
Pkg::ActivateSelections (); // now go through all selected selections and select their packages
map update_sum
= Pkg::PkgUpdateAll (Update::deleteOldPackages);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...