Hello community,
here is the log from the commit of package yast2-printer
checked in at Thu Oct 9 19:08:21 CEST 2008.
--------
--- yast2-printer/yast2-printer.changes 2008-10-08 12:19:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2008-10-09 12:33:46.620464000 +0200
@@ -1,0 +2,16 @@
+Thu Oct 9 12:26:11 CEST 2008 - jsmeix@suse.de
+
+- Check if the cups-client RPM is installed (strictly required)
+ and enforce to install it (otherwise abort) and
+ if the cups RPM is installed (not strictly required)
+ and try to install it but let the user proceed otherwise.
+- Prefer 'hp:/usb/' DeviceURIs by default.
+ The matching 'usb://HP/' is still available
+ via "More Connections".
+- Using separated progress file for create_printer_ppd_database
+ to show a progress even while waiting up to 300 seconds
+ for a response from the lpinfo command
+ (see Novell/Suse Bugzilla bnc#429397).
+- 2.17.19
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.17.18.tar.bz2
New:
----
yast2-printer-2.17.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.c17966/_old 2008-10-09 19:07:36.000000000 +0200
+++ /var/tmp/diff_new_pack.c17966/_new 2008-10-09 19:07:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.17.18)
+# spec file for package yast2-printer (Version 2.17.19)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/YaST/Modules/Printer
Name: yast2-printer
-Version: 2.17.18
+Version: 2.17.19
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.17.18.tar.bz2
+Source0: yast2-printer-2.17.19.tar.bz2
Prefix: /usr
BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite
Recommends: netcat
@@ -64,7 +64,7 @@
Michal Zugec
%prep
-%setup -n yast2-printer-2.17.18
+%setup -n yast2-printer-2.17.19
%build
%{prefix}/bin/y2tool y2autoconf
@@ -118,8 +118,20 @@
%doc %{prefix}/share/doc/packages/yast2-printer
%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
%exclude %{prefix}/share/doc/packages/yast2-printer/README
-
%changelog
+* Thu Oct 09 2008 jsmeix@suse.de
+- Check if the cups-client RPM is installed (strictly required)
+ and enforce to install it (otherwise abort) and
+ if the cups RPM is installed (not strictly required)
+ and try to install it but let the user proceed otherwise.
+- Prefer 'hp:/usb/' DeviceURIs by default.
+ The matching 'usb://HP/' is still available
+ via "More Connections".
+- Using separated progress file for create_printer_ppd_database
+ to show a progress even while waiting up to 300 seconds
+ for a response from the lpinfo command
+ (see Novell/Suse Bugzilla bnc#429397).
+- 2.17.19
* Wed Oct 08 2008 jsmeix@suse.de
- The "Share Printers" dialog should now work
- Increased MAXIMUM_WAIT to 300 seconds in
++++++ yast2-printer-2.17.18.tar.bz2 -> yast2-printer-2.17.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.18/configure new/yast2-printer-2.17.19/configure
--- old/yast2-printer-2.17.18/configure 2008-10-08 12:15:15.000000000 +0200
+++ new/yast2-printer-2.17.19/configure 2008-10-09 12:31:22.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.18.
+# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.19.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.17.18'
-PACKAGE_STRING='yast2-printer 2.17.18'
+PACKAGE_VERSION='2.17.19'
+PACKAGE_STRING='yast2-printer 2.17.19'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-printer 2.17.18 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.17.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.17.18:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.17.19:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.17.18
+yast2-printer configure 2.17.19
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-printer $as_me 2.17.18, which was
+It was created by yast2-printer $as_me 2.17.19, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.17.18'
+ VERSION='2.17.19'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.18"
+VERSION="2.17.19"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-printer $as_me 2.17.18, which was
+This file was extended by yast2-printer $as_me 2.17.19, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-printer config.status 2.17.18
+yast2-printer config.status 2.17.19
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.18/configure.in new/yast2-printer-2.17.19/configure.in
--- old/yast2-printer-2.17.18/configure.in 2008-10-08 12:15:11.000000000 +0200
+++ new/yast2-printer-2.17.19/configure.in 2008-10-09 12:31:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.17.18, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.17.19, http://bugs.opensuse.org/, yast2-printer)
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.17.18"
+VERSION="2.17.19"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.18/src/Printerlib.ycp new/yast2-printer-2.17.19/src/Printerlib.ycp
--- old/yast2-printer-2.17.18/src/Printerlib.ycp 2008-10-08 06:53:33.000000000 +0200
+++ new/yast2-printer-2.17.19/src/Printerlib.ycp 2008-10-09 09:40:39.000000000 +0200
@@ -33,6 +33,7 @@
module "Printerlib";
textdomain "printer";
+import "Package";
import "Popup";
import "Service";
@@ -75,6 +76,54 @@
return true;
}
+/**
+ * Test whether the package is installed (Package::Installed) and
+ * if not then test whether the package is available to be installed (Package::Available) and
+ * if yes then install it (Package::Install).
+ * @param package_name string of the package name
+ * @return true on success
+ */
+global boolean TestAndInstallPackage( string package_name )
+{ if( Package::Installed( package_name ) )
+ { return true;
+ }
+ // Is the package available to be installed?
+ // Package::Available returns nil if no package source is available.
+ boolean package_available = Package::Available( package_name );
+ if( nil == package_available )
+ { y2milestone( "Required package %1 is not installed and there is no package repository available.", package_name );
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name:
+ _("Required package %1 is not installed and there is no package repository available."),
+ package_name
+ )
+ );
+ return false;
+ }
+ if( ! package_available )
+ { y2milestone( "Required package %1 is not installed and not available in the repository.", package_name );
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name:
+ _("Required package %1 is not installed and not available in the repository."),
+ package_name
+ )
+ );
+ return false;
+ }
+ if( ! Package::Install( package_name ) )
+ { y2milestone( "Failed to install required package %1.", package_name );
+ Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name.
+ // Only a simple message because:
+ // Either the user has explicitely rejected to install the package,
+ // or this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ sformat( _("Failed to install required package %1."),
+ package_name
+ )
+ );
+ return false;
+ }
+ return true;
+}
+
// By default there is a local running cupsd.
// But to be on the safe side, assume it is not:
global boolean local_cupsd_accessible = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.18/src/Printer.ycp new/yast2-printer-2.17.19/src/Printer.ycp
--- old/yast2-printer-2.17.18/src/Printer.ycp 2008-10-08 06:53:33.000000000 +0200
+++ new/yast2-printer-2.17.19/src/Printer.ycp 2008-10-09 11:40:26.000000000 +0200
@@ -226,6 +226,7 @@
/*
* Local variables:
*/
+string create_database_progress_filename = "/var/lib/YaST2/create_printer_ppd_database.progress" ;
string database_filename = "/var/lib/YaST2/printer_ppd_database.ycp";
string create_database_commandline = "/usr/lib/YaST2/bin/create_printer_ppd_database >" + database_filename;
string autodetect_printers_progress_filename = "/var/lib/YaST2/autodetect_printers.progress" ;
@@ -265,9 +266,9 @@
`ReplacePoint( `id(`create_database_progress_replace_point),
`DownloadProgress( // Header of a DownloadProgress indicator:
_("Retrieving printer driver information..."),
- database_filename,
- // On my openSUSE 10.3 the size is about 1700000 bytes:
- 1900000
+ create_database_progress_filename,
+ // On my openSUSE 11.0 the size is about 80000 bytes:
+ 90000
)
)
)
@@ -602,19 +603,38 @@
Progress::New( // Header of a Progress::New:
_("Initializing Printer Configuration"),
" ",
- 1,
+ 2,
[ // 1. progress stage name of a Progress::New:
- _("Autodetect already configured printers"),
+ _("Check installed packages"),
+ // 2. progress stage name of a Progress::New:
+ _("Determine basic print system settings")
],
[ // 1. progress step progress bar title of a Progress::New:
- _("Autodetecting already configured printers..."),
+ _("Checking installed packages..."),
+ // 2. progress step progress bar title of a Progress::New:
+ _("Determining basic print system settings..."),
// Last progress step progress bar title of a Progress::New:
_("Finished")
],
""
);
- // Progress 1. stage (Autodetect already configured printers):
+ // Progress 1. stage (Check installed packages):
if( Abort() ) return false;
+ // The cups-client RPM is the minimum requirement
+ // for accessing remote CUPS servers via a "client-only" config.
+ // Therefore abort (return false) if cups-client is not installed:
+ if( ! Printerlib::TestAndInstallPackage( "cups-client" ) )
+ { return false;
+ }
+ // The cups RPM ist the default requirement
+ // for accessing remote CUPS servers via CUPS Browsing
+ // and it is the minimum requirement for local print queues.
+ // Therefore try to install cups but because for a "client-only" config
+ // only cups-client is required, proceed even if cups is not installed:
+ Printerlib::TestAndInstallPackage( "cups" );
+ // Progress 2. stage (Determine basic print system settings):
+ if( Abort() ) return false;
+ Progress::NextStage();
// Only in the second stage of the system installation make sure that a local cupsd is running
// because it is needed for automated queue setup during system installation
// see https://bugzilla.novell.com/show_bug.cgi?id=418585
@@ -875,6 +895,16 @@
// which is needed here to preserve any entry to be on the safe side:
connections = (list