Hello community,
here is the log from the commit of package yast2
checked in at Tue Apr 25 17:35:45 CEST 2006.
--------
--- yast2/yast2.changes 2006-04-20 22:53:25.000000000 +0200
+++ STABLE/yast2/yast2.changes 2006-04-25 14:35:15.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 25 14:24:45 CEST 2006 - visnov@suse.cz
+
+- ensure importing trusted RPM keys before initializing sources (#169121)
+- 2.13.53
+
+-------------------------------------------------------------------
Old:
----
yast2-2.13.52.tar.bz2
New:
----
yast2-2.13.53.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Mrw62j/_old 2006-04-25 17:35:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Mrw62j/_new 2006-04-25 17:35:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.13.52)
+# spec file for package yast2 (Version 2.13.53)
#
# 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
-Version: 2.13.52
+Version: 2.13.53
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.13.52.tar.bz2
+Source0: yast2-2.13.53.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
@@ -93,7 +93,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.13.52
+%setup -n yast2-2.13.53
%build
%{prefix}/bin/y2tool y2autoconf
@@ -192,6 +192,9 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Tue Apr 25 2006 - visnov@suse.cz
+- ensure importing trusted RPM keys before initializing sources (#169121)
+- 2.13.53
* Thu Apr 20 2006 - jsrain@suse.de
- handle installation restart with repeating last step (#167561)
- 2.13.52
++++++ yast2-2.13.52.tar.bz2 -> yast2-2.13.53.tar.bz2 ++++++
++++ 3621 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-2.13.52/Makefile.am new/yast2-2.13.53/Makefile.am
--- old/yast2-2.13.52/Makefile.am 2006-04-20 22:53:31.000000000 +0200
+++ new/yast2-2.13.53/Makefile.am 2006-04-24 14:31:18.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-2.13.52/Makefile.am.common new/yast2-2.13.53/Makefile.am.common
--- old/yast2-2.13.52/Makefile.am.common 2006-04-20 22:53:31.000000000 +0200
+++ new/yast2-2.13.53/Makefile.am.common 2006-04-24 14:31:18.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-2.13.52/VERSION new/yast2-2.13.53/VERSION
--- old/yast2-2.13.52/VERSION 2006-04-20 22:50:07.000000000 +0200
+++ new/yast2-2.13.53/VERSION 2006-04-25 14:25:31.000000000 +0200
@@ -1 +1 @@
-2.13.52
+2.13.53
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-2.13.52/configure.in new/yast2-2.13.53/configure.in
--- old/yast2-2.13.52/configure.in 2006-04-20 22:53:30.000000000 +0200
+++ new/yast2-2.13.53/configure.in 2006-04-24 14:31:18.000000000 +0200
@@ -120,8 +120,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)
@@ -148,10 +148,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
dnl Check packages expect and dejagnu
AC_PATH_PROG(MYEXPECT, expect, false)
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-2.13.52/library/modules/Version.ycp new/yast2-2.13.53/library/modules/Version.ycp
--- old/yast2-2.13.52/library/modules/Version.ycp 2006-04-20 22:53:53.000000000 +0200
+++ new/yast2-2.13.53/library/modules/Version.ycp 2006-04-25 14:27:21.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.13.52";
+global string yast2 = "2.13.53";
/* EOF */
}
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-2.13.52/library/packages/src/PackageSystem.ycp new/yast2-2.13.53/library/packages/src/PackageSystem.ycp
--- old/yast2-2.13.52/library/packages/src/PackageSystem.ycp 2006-03-30 19:30:24.000000000 +0200
+++ new/yast2-2.13.53/library/packages/src/PackageSystem.ycp 2006-04-25 14:26:25.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Vidner
* Michal Svec
*
- * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $
+ * $Id: PackageSystem.ycp 30446 2006-04-25 12:26:14Z visnov $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -65,6 +65,7 @@
*/
global void EnsureSourceInit() {
PackageLock::Check ();
+
if(source_initialized)
{
// this way, if somebody closed the cache outside of Package
@@ -86,6 +87,14 @@
{
UI::OpenDialog(`opt(`decorated ), `Label(message));
}
+
+ if(! target_initialized)
+ {
+ // make sure we have the RPM keys imported
+ EnsureTargetInit();
+ }
+
+
list sources = Pkg::SourceStartCache (true);
if (!Mode::commandline()) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...