Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Fri Apr 16 02:03:58 CEST 2010.
--------
--- yast2-packager/yast2-packager.changes 2010-01-11 18:09:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2010-04-12 14:44:49.000000000 +0200
@@ -1,0 +2,43 @@
+Mon Apr 12 12:26:42 UTC 2010 - lslezak@suse.cz
+
+- added a nil check in InstURL.ycp so the testsuite passes
+ during build
+- 2.19.4
+
+-------------------------------------------------------------------
+Tue Apr 6 17:44:25 CEST 2010 - locilka@suse.cz
+
+- Searching for LiveCD license in /usr/share/doc/licenses and /
+ directories (BNC #594042).
+
+-------------------------------------------------------------------
+Wed Mar 31 14:35:48 UTC 2010 - lslezak@suse.cz
+
+- put the Linuxrc CD/DVD device to the beginning of the CD/DVD
+ device list - prefer the Linuxrc medium (bnc#588810)
+
+-------------------------------------------------------------------
+Tue Mar 2 10:09:38 CET 2010 - ug@suse.de
+
+- fixed AutoYaST post-patterns
+
+-------------------------------------------------------------------
+Fri Feb 26 14:46:32 CET 2010 - locilka@suse.cz
+
+- Calling ProductLicense cleanup before leaving the license dialog
+ (BNC #581933).
+
+------------------------------------------------------------------
+Thu Jan 14 13:40:25 UTC 2010 - lslezak@suse.cz
+
+- install also xorg-x11-fonts package when remote X or VNC
+ installation is used (bnc#570363)
+
+-------------------------------------------------------------------
+Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
+
+- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
+ where root privileges are needed, removed X-KDE-SubstituteUID key
+ (bnc#540627)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.19.3.tar.bz2
New:
----
yast2-packager-2.19.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.nLM8O1/_old 2010-04-16 02:01:57.000000000 +0200
+++ /var/tmp/diff_new_pack.nLM8O1/_new 2010-04-16 02:01:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.19.3)
+# spec file for package yast2-packager (Version 2.19.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,54 +19,75 @@
Name: yast2-packager
-Version: 2.19.3
+Version: 2.19.4
Release: 1
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.19.3.tar.bz2
+Source0: yast2-packager-2.19.4.tar.bz2
+
Prefix: /usr
+
Group: System/YaST
License: GPLv2+
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
+
# HTTP.ycp
BuildRequires: yast2-transfer
+
# Installation summary in PackagesUI::
BuildRequires: yast2 >= 2.18.1
+
# "keeppackages" repo property
BuildRequires: yast2-pkg-bindings >= 2.17.27
+
# Newly added RPM
Requires: yast2-country-data >= 2.16.3
+
# "keeppackages" repo property
Requires: yast2-pkg-bindings >= 2.17.27
+
# Installation summary in PackagesUI::
Requires: yast2 >= 2.18.1
+
# unzipping license file
Requires: unzip
+
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
Requires: yast2-transfer
+
# XML module (inst_productsources.ycp)
Requires: yast2-xml
+
# Bugzilla #305503 - storing/checking MD5 of licenses
Requires: /usr/bin/md5sum
+
# .process agent
Requires: yast2-core >= 2.16.35
+
# setenv() builtin
Conflicts: yast2-core < 2.15.10
+
# NotEnoughMemory-related functions moved to misc.ycp import-file
Conflicts: yast2-add-on < 2.15.15
+
# One of yast2-qt-pkg, yast2-ncurses-pkg, yast2-gtk (-pkg)
Requires: yast2_ui_pkg
+
# ensure that 'checkmedia' is on the medium
Recommends: checkmedia
+
Provides: yast2-config-package-manager
Obsoletes: yast2-config-package-manager
Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg
Obsoletes: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg
Provides: yast2-trans-package-manager yast2-trans-inst-packages
Obsoletes: yast2-trans-package-manager yast2-trans-inst-packages
+
Summary: YaST2 - Package Library
%package webpin
License: GPLv2+
+
Group: System/YaST2
Summary: YaST2 - Webpin package search client
@@ -79,14 +100,16 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.19.3
+%setup -n yast2-packager-2.19.4
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
+
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
++++++ yast2-packager-2.19.3.tar.bz2 -> yast2-packager-2.19.4.tar.bz2 ++++++
++++ 3516 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.3/VERSION new/yast2-packager-2.19.4/VERSION
--- old/yast2-packager-2.19.3/VERSION 2010-01-11 18:05:14.000000000 +0100
+++ new/yast2-packager-2.19.4/VERSION 2010-04-12 14:41:23.000000000 +0200
@@ -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-packager-2.19.3/configure.in new/yast2-packager-2.19.4/configure.in
--- old/yast2-packager-2.19.3/configure.in 2010-01-11 18:06:15.000000000 +0100
+++ new/yast2-packager-2.19.4/configure.in 2010-04-12 14:42:58.000000000 +0200
@@ -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-packager, 2.19.3, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.19.4, 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.19.3"
+VERSION="2.19.4"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
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.3/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.19.4/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.19.3/src/clients/inst_rpmcopy.ycp 2009-03-17 19:50:03.000000000 +0100
+++ new/yast2-packager-2.19.4/src/clients/inst_rpmcopy.ycp 2010-03-24 08:23:28.000000000 +0100
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 56190 2009-03-17 18:50:02Z lslezak $
+ * $Id: inst_rpmcopy.ycp 61082 2010-03-02 09:10:41Z ug $
*/
{
@@ -156,7 +156,7 @@
}
list<string> failed = [];
- list<string> patterns = []; // WORKAROUND, REMOVE!!! AutoinstData::post_patterns;
+ list<string> patterns = AutoinstData::post_patterns;
/* set SoftLock to avoid the installation of recommended patterns (#159466) */
foreach( map p, Pkg::ResolvableProperties ("", `pattern, ""), ``{
Pkg::ResolvableSetSoftLock( p["name"]:"", `pattern );
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.3/src/clients/install_test.ycp new/yast2-packager-2.19.4/src/clients/install_test.ycp
--- old/yast2-packager-2.19.3/src/clients/install_test.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.19.4/src/clients/install_test.ycp 2010-01-12 11:48:56.000000000 +0100
@@ -0,0 +1,6 @@
+{
+ import "Package";
+
+
+ Package::InstallAll(["yast2-nfs-server"]);
+}
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.3/src/config/sw_single.desktop new/yast2-packager-2.19.4/src/config/sw_single.desktop
--- old/yast2-packager-2.19.3/src/config/sw_single.desktop 2008-05-19 15:13:00.000000000 +0200
+++ new/yast2-packager-2.19.4/src/config/sw_single.desktop 2010-01-14 14:56:17.000000000 +0100
@@ -17,9 +17,8 @@
X-SuSE-YaST-AutoInstResource=
Icon=yast-sw_single
-Exec=/sbin/yast2 sw_single
+Exec=xdg-su -c "/sbin/yast2 sw_single"
Name=Software Management
GenericName=Install or remove software packages and manage software repositories
-X-KDE-SubstituteUID=true
StartupNotify=true
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.3/src/config/sw_source.desktop new/yast2-packager-2.19.4/src/config/sw_source.desktop
--- old/yast2-packager-2.19.3/src/config/sw_source.desktop 2008-05-19 15:13:00.000000000 +0200
+++ new/yast2-packager-2.19.4/src/config/sw_source.desktop 2010-01-14 14:56:17.000000000 +0100
@@ -17,9 +17,8 @@
X-SuSE-YaST-AutoInstResource=
Icon=yast-sw_source
-Exec=/sbin/yast2 repositories
+Exec=xdg-su -c "/sbin/yast2 repositories"
Name=Software Repositories
GenericName=Choose the repositories for installation of software packages (CD, network, etc.), add the community repositories
-X-KDE-SubstituteUID=true
StartupNotify=true
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.3/src/config/webpin.desktop new/yast2-packager-2.19.4/src/config/webpin.desktop
--- old/yast2-packager-2.19.3/src/config/webpin.desktop 2009-09-21 16:47:47.000000000 +0200
+++ new/yast2-packager-2.19.4/src/config/webpin.desktop 2010-01-14 14:56:17.000000000 +0100
@@ -17,9 +17,8 @@
X-SuSE-YaST-AutoInstResource=
Icon=yast-webpin
-Exec=/sbin/yast2 webpin_package_search
+Exec=xdg-su -c "/sbin/yast2 webpin_package_search"
Name=Package Search (webpin)
GenericName=Search for software in online repositories
-X-KDE-SubstituteUID=true
StartupNotify=true
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.3/src/modules/InstURL.ycp new/yast2-packager-2.19.4/src/modules/InstURL.ycp
--- old/yast2-packager-2.19.3/src/modules/InstURL.ycp 2009-01-19 13:56:49.000000000 +0100
+++ new/yast2-packager-2.19.4/src/modules/InstURL.ycp 2010-04-12 14:42:53.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Convert /etc/install.inf data to URL
*
*
- * $Id: InstURL.ycp 53118 2008-11-09 10:51:18Z coolo $
+ * $Id: InstURL.ycp 61670 2010-04-12 12:42:53Z lslezak $
*/
{
@@ -56,6 +56,33 @@
if (size (ready) != 0)
devlist = ready;
+
+ // add the Linuxrc medium to the beginning
+ string repo_url = Linuxrc::InstallInf("RepoURL");
+
+ if (repo_url == nil)
+ {
+ repo_url = "";
+ }
+
+ if (regexpmatch(tolower(repo_url), "^cd:") || regexpmatch(tolower(repo_url), "^dvd:"))
+ {
+ y2milestone("Found CD/DVD device in Linuxrc RepoURL: %1", repo_url);
+ string linuxrc_device = regexpsub(repo_url, "device=(.*)$", "\\1");
+ if (linuxrc_device != nil && linuxrc_device != "")
+ {
+ linuxrc_device = "/dev/" + linuxrc_device;
+ y2milestone("Using Linuxrc device: %1", linuxrc_device);
+
+ // remove the device if it is already in the list
+ devlist = filter(string d, devlist, {return d != linuxrc_device;});
+ // put the linuxrc device at the beginning
+ devlist = prepend(devlist, linuxrc_device);
+
+ y2milestone("Using CD/DVD device list: %1", devlist);
+ }
+ }
+
foreach (string d, devlist, {
if (d != "")
{
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.3/src/modules/Packages.ycp new/yast2-packager-2.19.4/src/modules/Packages.ycp
--- old/yast2-packager-2.19.3/src/modules/Packages.ycp 2010-01-06 20:10:26.000000000 +0100
+++ new/yast2-packager-2.19.4/src/modules/Packages.ycp 2010-01-14 14:57:12.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 60245 2010-01-06 19:10:25Z lslezak $
+ * $Id: Packages.ycp 60363 2010-01-14 13:57:12Z lslezak $
*/
{
@@ -718,6 +718,7 @@
packages = add (packages, "tightvnc");
packages = add (packages, "yast2-qt");
packages = add (packages, "xorg-x11");
+ packages = add (packages, "xorg-x11-fonts");
packages = add (packages, "icewm");
packages = add (packages, "sax2-tools");
packages = add (packages, "xinetd");
@@ -728,6 +729,7 @@
{
packages = add (packages, "yast2-qt");
packages = add (packages, "xorg-x11");
+ packages = add (packages, "xorg-x11-fonts");
packages = add (packages, "icewm");
packages = add (packages, "sax2-tools");
}
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.3/src/modules/ProductLicense.ycp new/yast2-packager-2.19.4/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.19.3/src/modules/ProductLicense.ycp 2010-01-11 17:39:31.000000000 +0100
+++ new/yast2-packager-2.19.4/src/modules/ProductLicense.ycp 2010-04-12 14:40:51.000000000 +0200
@@ -513,25 +513,45 @@
void SearchForLicense_LiveCDInstallation (integer src_id, string fallback_dir) {
y2milestone ("LiveCD License");
- if (FileUtils::Exists ("/license.tar.gz")) {
- tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir));
- string license_file = "/license.tar.gz";
+ // BNC #594042: Multiple license locations
+ list <string> license_locations = ["/usr/share/doc/licenses/", "/"];
- if (UnpackLicenseTgzFileToDirectory (license_file, tmpdir)) {
- license_dir = tmpdir;
- license_file_print = "license.tar.gz";
- } else {
- CleanUpLicense (tmpdir);
- license_file = nil;
+ license_dir = nil;
+ info_file = nil;
+
+ foreach (string license_location, license_locations, {
+ license_location = sformat ("%1/license.tar.gz", license_location);
+
+ if (FileUtils::Exists (license_location)) {
+ y2milestone ("Using license: %1", license_location);
+ tmpdir = sformat ("%1/product-license/LiveCD/", (string) SCR::Read (.target.tmpdir));
+
+ if (UnpackLicenseTgzFileToDirectory (license_location, tmpdir)) {
+ license_dir = tmpdir;
+ license_file_print = "license.tar.gz";
+ } else {
+ CleanUpLicense (tmpdir);
+ }
+ break;
}
- } else {
- license_dir = nil;
+ });
+
+ if (license_dir == nil) {
+ y2milestone ("No license found in: %1", license_locations);
}
- if (FileUtils::Exists ("/README.BETA")) {
- info_file = "/README.BETA";
- } else {
- info_file = nil;
+ foreach (string info_location, license_locations, {
+ info_location = sformat ("%1/README.BETA", info_location);
+
+ if (FileUtils::Exists (info_location)) {
+ y2milestone ("Using info file: %1", info_location);
+ info_file = info_location;
+ break;
+ }
+ });
+
+ if (info_file == nil) {
+ y2milestone ("No info file found in: %1", license_locations);
}
}
@@ -963,6 +983,15 @@
}
/**
+ * Generic cleanup
+ */
+void CleanUp() {
+ // BNC #581933: All license IDs are cached while the module is in memory.
+ // Removing them when leaving the license dialog.
+ license_ids = [];
+}
+
+/**
* 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
@@ -1035,6 +1064,8 @@
Wizard::CloseDialog();
}
+ CleanUp();
+
return ret;
}
@@ -1158,6 +1189,8 @@
Wizard::CloseDialog();
}
+ CleanUp();
+
return ret;
}
@@ -1221,6 +1254,8 @@
}
}
+ CleanUp();
+
return true;
}
@@ -1250,6 +1285,8 @@
}
}
+ CleanUp();
+
return true;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org