Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Tue Aug 11 00:10:46 CEST 2009.
--------
--- yast2-packager/yast2-packager.changes 2009-05-14 15:54:08.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2009-07-31 12:55:11.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Jul 22 14:30:14 CEST 2009 - kmachalkova@suse.cz
+
+- Splitting webpin-related code off to separate package
+ (yast2-packager-webpin), adding new .desktop file to it
+- Start webpin search from pkg managers ( accept `webpin symbol
+ from the main loop) (both FaTE#306928)
+- 2.18.9
+
+-------------------------------------------------------------------
+Mon Jun 22 11:10:09 CEST 2009 - locilka@suse.cz
+
+- Adjusted ProductLicense to look for more license filename
+ patterns (html, txt) (bnc #504803).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.18.8.tar.bz2
New:
----
yast2-packager-2.18.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.RVo6RI/_old 2009-08-11 00:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.RVo6RI/_new 2009-08-11 00:09:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.18.8)
+# spec file for package yast2-packager (Version 2.18.9)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-packager
-Version: 2.18.8
+Version: 2.18.9
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.18.8.tar.bz2
+Source0: yast2-packager-2.18.9.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
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
@@ -65,20 +65,21 @@
Obsoletes: yast2-trans-package-manager yast2-trans-inst-packages
Summary: YaST2 - Package Library
+%package webpin
+License: GPL v2 or later
+Group: System/YaST2
+Summary: YaST2 - Webpin package search client
+
%description
This package contains the scanner/parser and dependency checker for all
packages handled by YaST2.
-
-
-Authors:
---------
- Klaus Kaempf
- Stefan Schubert
- Arvin Schnell
+%description webpin
+This package contains a client for searching packages in online repositories
+(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.18.8
+%setup -n yast2-packager-2.18.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -88,7 +89,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"
@@ -108,9 +111,20 @@
/usr/share/YaST2/include/checkmedia/*
/usr/share/YaST2/include/packager/*
/usr/share/YaST2/clients/*.ycp
+%exclude /usr/share/YaST2/clients/webpin_package_search.ycp
/usr/share/YaST2/modules/*
+%exclude /usr/share/YaST2/modules/WebpinPackageSearch.ycp
+%exclude /usr/share/YaST2/modules/WebpinPackageSearch.ybc
%{prefix}/share/applications/YaST2/*.desktop
+%exclude %{prefix}/share/applications/YaST2/webpin.desktop
/usr/share/YaST2/scrconf/*
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
+
+%files webpin
+%defattr(-,root,root)
+/usr/share/YaST2/clients/webpin_package_search.ycp
+/usr/share/YaST2/modules/WebpinPackageSearch.ycp
+/usr/share/YaST2/modules/WebpinPackageSearch.ybc
+%{prefix}/share/applications/YaST2/webpin.desktop
%changelog
++++++ yast2-packager-2.18.8.tar.bz2 -> yast2-packager-2.18.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/VERSION new/yast2-packager-2.18.9/VERSION
--- old/yast2-packager-2.18.8/VERSION 2009-05-14 15:51:46.000000000 +0200
+++ new/yast2-packager-2.18.9/VERSION 2009-07-31 12:51:31.000000000 +0200
@@ -1 +1 @@
-2.18.8
+2.18.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/autodocs-ycp.ami new/yast2-packager-2.18.9/autodocs-ycp.ami
--- old/yast2-packager-2.18.8/autodocs-ycp.ami 2009-05-14 15:52:19.000000000 +0200
+++ new/yast2-packager-2.18.9/autodocs-ycp.ami 2009-07-31 12:53:46.000000000 +0200
@@ -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' old/yast2-packager-2.18.8/configure new/yast2-packager-2.18.9/configure
--- old/yast2-packager-2.18.8/configure 2009-05-14 15:52:24.000000000 +0200
+++ new/yast2-packager-2.18.9/configure 2009-07-31 12:53:50.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-packager 2.18.8.
+# Generated by GNU Autoconf 2.63 for yast2-packager 2.18.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.18.8'
-PACKAGE_STRING='yast2-packager 2.18.8'
+PACKAGE_VERSION='2.18.9'
+PACKAGE_STRING='yast2-packager 2.18.9'
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-packager 2.18.8 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.18.9 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-packager 2.18.8:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.18.9:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.18.8
+yast2-packager configure 2.18.9
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-packager $as_me 2.18.8, which was
+It was created by yast2-packager $as_me 2.18.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.18.8'
+ VERSION='2.18.9'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.8"
+VERSION="2.18.9"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3451,7 +3451,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.18.8, which was
+This file was extended by yast2-packager $as_me 2.18.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-packager config.status 2.18.8
+yast2-packager config.status 2.18.9
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-packager-2.18.8/configure.in new/yast2-packager-2.18.9/configure.in
--- old/yast2-packager-2.18.8/configure.in 2009-05-14 15:52:18.000000000 +0200
+++ new/yast2-packager-2.18.9/configure.in 2009-07-31 12:53:46.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.18.8, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.18.9, 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.8"
+VERSION="2.18.9"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/doc/autodocs/Makefile.in new/yast2-packager-2.18.9/doc/autodocs/Makefile.in
--- old/yast2-packager-2.18.8/doc/autodocs/Makefile.in 2009-05-14 15:52:25.000000000 +0200
+++ new/yast2-packager-2.18.9/doc/autodocs/Makefile.in 2009-07-31 12:53:52.000000000 +0200
@@ -17,7 +17,7 @@
# Makefile.am for YCP module .../doc/autodocs
# -*- 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
@@ -26,6 +26,10 @@
# 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
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -142,7 +146,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -185,7 +189,7 @@
ystartupdir = @ystartupdir@
AUTODOCS_YCP = $(wildcard $(srcdir)/../../src/*/*.ycp)
AUTODOCS_PM = $(wildcard $(srcdir)/../../src/*/*.pm)
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
@@ -371,14 +375,15 @@
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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/packager.pot new/yast2-packager-2.18.9/packager.pot
--- old/yast2-packager-2.18.8/packager.pot 2008-09-10 10:47:12.000000000 +0200
+++ new/yast2-packager-2.18.9/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-# translation of packager.po to
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Andrew Spackman , 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: packager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-04 13:54+0200\n"
-"PO-Revision-Date: 2008-08-27 21:38+1200\n"
-"Last-Translator: Andrew Spackman \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: src/clients/inst_packages.ycp:76
-msgid ""
-"<p>\n"
-"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
-"\t\t Available tasks and software for this system are shown by category in the left\n"
-"\t\t column. To view a description for an item, select it in the list.\n"
-"\t\t </p>"
-msgstr ""
-"<p>\n"
-"\t\t This dialog allows you to define this system's tasks and the software that has to be installed.\n"
-"\t\t Available tasks and software for this system are shown by category in the left\n"
-"\t\t column. To view a description for an item, select it in the list.\n"
-"\t\t </p>"
-
-#. TRANSLATORS: dialog help
-#: src/clients/inst_productsources.ycp:600
-msgid ""
-"<p>Please wait while the packager is being initialized\n"
-"and the list of servers dowloaded from Web.</p>\n"
-msgstr ""
-"<p>Please wait while the packager is being initialized\n"
-"and the list of servers downloaded from the Web.</p>\n"
-
-#. help, continued
-#: src/clients/repositories.ycp:486
-msgid ""
-"<p>\n"
-"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n"
-"to also perform the changes in that package management system.</p>\n"
-msgstr ""
-"<p>\n"
-"<b>Synchronize Changes with ZENworks</b> will also call <tt>rug</tt>\n"
-"to perform the changes in that package management system.</p>\n"
-
-#: src/clients/webpin_package_search.ycp:223
-msgid ""
-"<p><big><b>Security</b></big><br>\n"
-"The software found is often not part of the distribution itself and the level of trust\n"
-"depends on yourself. We do not take any responsibilities for installing\n"
-"such software.</p>"
-msgstr ""
-"<p><big><b>Security</b></big><br>\n"
-"The software found is often not part of the distribution itself and the level of trust\n"
-"depends on yourself. We do not take any responsibility for installing\n"
-"such software.</p>"
-
-#. help text - media check 2/8
-#: src/include/checkmedia/ui.ycp:279
-msgid ""
-"<P>When you have a problem with\n"
-"the installation and are using a CD or DVD installation medium, you should check\n"
-"whether the medium is broken.</P>\n"
-msgstr ""
-"<P>When you have a problem with\n"
-"the installation and you are using a CD or DVD installation medium, you should check\n"
-"whether the medium is broken.</P>\n"
-
-#: src/include/checkmedia/ui.ycp:432
-msgid ""
-"The medium does not contain MD5 checksum.\n"
-"The content of the medium cannot be verified.\n"
-"\n"
-"Only readability of the medium will be checked."
-msgstr ""
-"The medium does not contain a MD5 checksum.\n"
-"The content of the medium cannot be verified.\n"
-"\n"
-"Only readability of the medium will be checked."
-
-#. (see bnc#178357 why these numbers)
-#. translators: help text for software proposal
-#: src/modules/Packages.ycp:302
-msgid "<P>The propsal contains total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>"
-msgstr "<P>The propsal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>"
-
-#. help text for software proposal
-#: src/modules/Packages.ycp:304
-msgid "<P>The total size to download is size of packages which will be downloaded from remote (network) repositories. This value is important when the connection is slow or when there is a data limit for downloading.</P>"
-msgstr ""
-"<P>The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n"
-" This value is important when the connection is slow or when there is a data limit for downloading.</P>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/src/clients/sw_single.ycp new/yast2-packager-2.18.9/src/clients/sw_single.ycp
--- old/yast2-packager-2.18.8/src/clients/sw_single.ycp 2009-05-14 15:52:15.000000000 +0200
+++ new/yast2-packager-2.18.9/src/clients/sw_single.ycp 2009-07-22 14:22:29.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 57182 2009-05-14 13:52:15Z lslezak $
+ * $Id: sw_single.ycp 58130 2009-07-22 12:12:50Z kmachalkova $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -451,6 +451,11 @@
symbol online_result = (symbol)WFM::CallFunction( "online_update_configuration", []);
force_restart = true;
}
+ else if (result == `webpin)
+ {
+ symbol online_result = (symbol)WFM::CallFunction( "webpin_package_search", []);
+ force_restart = true;
+ }
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/src/config/webpin.desktop new/yast2-packager-2.18.9/src/config/webpin.desktop
--- old/yast2-packager-2.18.8/src/config/webpin.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.18.9/src/config/webpin.desktop 2009-07-22 14:22:39.000000000 +0200
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=webpin_package_search
+
+X-SuSE-YaST-Group=Software
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=
+
+Icon=yast-sw_single
+Exec=/sbin/yast2 webpin_package_search
+
+Name=Package Search (webpin)
+GenericName= Voulez-vous chercher les paquets avec moi?
+X-KDE-SubstituteUID=true
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.8/src/modules/ProductLicense.ycp new/yast2-packager-2.18.9/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.18.8/src/modules/ProductLicense.ycp 2008-12-16 15:34:40.000000000 +0100
+++ new/yast2-packager-2.18.9/src/modules/ProductLicense.ycp 2009-06-24 12:53:07.000000000 +0200
@@ -34,6 +34,13 @@
// list of already accepted licenses
list <string> already_accepted_licenses = [];
+list <string> license_patterns = [
+ "license\\.html", "license\\.%1\\.html",
+ "license\\.htm", "license\\.%1\\.htm",
+ "license\\.txt", "license\\.%1\\.txt",
+ "license\\.*"
+];
+
/**
* Creates a unique identification from filename
* (MD5sum + file size)
@@ -110,9 +117,9 @@
// License is HTML (or RichText)
if (regexpmatch(license_text, ""))
- rt = `MinWidth (80,
- `RichText(`id (`welcome_text), license_text)
- );
+ rt = `MinWidth (80, `RichText(`id (`welcome_text),
+ license_text
+ ));
// License is plain text
// details in BNC #449188
else
@@ -610,7 +617,7 @@
}
licenses = LicenseFiles (license_dir,
- ["license.txt", "license\\.%1\\.txt"]);
+ license_patterns);
if (info_file == nil && size (licenses) == 0)
return `auto;
@@ -912,7 +919,7 @@
global symbol AskAddOnLicenseAgreement (integer src_id) {
return AskLicenseAgreement (src_id, "",
- [ "license\\.txt", "license\\.%1\\.txt" ],
+ license_patterns,
"abort",
// back button is disabled
false, false, false);
@@ -927,7 +934,7 @@
enable_back = false;
return AskLicenseAgreement (nil, "",
- [ "license\\.txt", "license\\.%1\\.txt" ],
+ license_patterns,
action,
// back button is enabled
enable_back, true, true);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org