Hello community, here is the log from the commit of package yast2-printer checked in at Wed Nov 8 18:38:35 CET 2006. -------- --- yast2-printer/yast2-printer.changes 2006-11-07 15:50:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2006-11-08 18:28:54.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 8 18:27:20 CET 2006 - mzugec@suse.cz + +- #190173 - read settings from CUPS daemon after daemon starts +- 2.14.9 + +------------------------------------------------------------------- Old: ---- yast2-printer-2.14.8.tar.bz2 New: ---- yast2-printer-2.14.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.f6Xcit/_old 2006-11-08 18:37:12.000000000 +0100 +++ /var/tmp/diff_new_pack.f6Xcit/_new 2006-11-08 18:37:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.14.8) +# spec file for package yast2-printer (Version 2.14.9) # # 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-printer -Version: 2.14.8 +Version: 2.14.9 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.14.8.tar.bz2 +Source0: yast2-printer-2.14.9.tar.bz2 prefix: /usr BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel Requires: yast2 netcat zlib blocxx @@ -33,7 +33,7 @@ %prep -%setup -n yast2-printer-2.14.8 +%setup -n yast2-printer-2.14.9 %build %{prefix}/bin/y2tool y2autoconf @@ -102,6 +102,9 @@ %doc %{prefix}/share/doc/packages/yast2-printer %changelog -n yast2-printer +* Wed Nov 08 2006 - mzugec@suse.cz +- #190173 - read settings from CUPS daemon after daemon starts +- 2.14.9 * Tue Nov 07 2006 - mzugec@suse.cz - fixed src/config/printer.rnc * Tue Nov 07 2006 - mzugec@suse.cz ++++++ yast2-printer-2.14.8.tar.bz2 -> yast2-printer-2.14.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.8/VERSION new/yast2-printer-2.14.9/VERSION --- old/yast2-printer-2.14.8/VERSION 2006-11-07 15:36:51.000000000 +0100 +++ new/yast2-printer-2.14.9/VERSION 2006-11-08 18:19:36.000000000 +0100 @@ -1 +1 @@ -2.14.8 +2.14.9 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.8/configure new/yast2-printer-2.14.9/configure --- old/yast2-printer-2.14.8/configure 2006-11-07 15:46:27.000000000 +0100 +++ new/yast2-printer-2.14.9/configure 2006-11-08 18:20:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-printer 2.14.8. +# Generated by GNU Autoconf 2.59 for yast2-printer 2.14.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.14.8' -PACKAGE_STRING='yast2-printer 2.14.8' +PACKAGE_VERSION='2.14.9' +PACKAGE_STRING='yast2-printer 2.14.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -959,7 +959,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.14.8 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.14.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1026,7 +1026,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.14.8:";; + short | recursive ) echo "Configuration of yast2-printer 2.14.9:";; esac cat <<\_ACEOF @@ -1169,7 +1169,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.14.8 +yast2-printer configure 2.14.9 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1183,7 +1183,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.14.8, which was +It was created by yast2-printer $as_me 2.14.9, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1913,7 +1913,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.14.8' + VERSION='2.14.9' cat >>confdefs.h <<_ACEOF @@ -2124,7 +2124,7 @@ -VERSION="2.14.8" +VERSION="2.14.9" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec@suse.cz>" @@ -21730,7 +21730,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-printer $as_me 2.14.8, which was +This file was extended by yast2-printer $as_me 2.14.9, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21793,7 +21793,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-printer config.status 2.14.8 +yast2-printer config.status 2.14.9 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.8/configure.in new/yast2-printer-2.14.9/configure.in --- old/yast2-printer-2.14.8/configure.in 2006-11-07 15:46:00.000000000 +0100 +++ new/yast2-printer-2.14.9/configure.in 2006-11-08 18:19:43.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.14.8, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.14.9, http://bugs.opensuse.org/, yast2-printer) 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.14.8" +VERSION="2.14.9" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.8/src/modules/Printer.ycp new/yast2-printer-2.14.9/src/modules/Printer.ycp --- old/yast2-printer-2.14.8/src/modules/Printer.ycp 2006-10-30 18:23:55.000000000 +0100 +++ new/yast2-printer-2.14.9/src/modules/Printer.ycp 2006-11-08 18:19:07.000000000 +0100 @@ -12,7 +12,7 @@ * Petr Blahos <pblahos@suse.cz> * Jiri Srain <jsrain@suse.cz> * - * $Id: Printer.ycp 33905 2006-10-30 17:22:25Z mzugec $ + * $Id: Printer.ycp 34180 2006-11-08 17:17:46Z mzugec $ * * Well we all know what modules are for. */ @@ -1562,6 +1562,15 @@ if (with_daemon && Spooler::Get () == "cups") { + // fixed #190173 - lpd printer doesn't get installed (in other MODEs cupsd already is running) + if (Mode::autoinst()) { + y2milestone("autoyast mode - starting CUPS"); + CUPS::StartDaemon(); + //wait until daemon runing - maximum 10 seconds + string wait_for_daemon = "for i in $(seq 10);do echo -n '.';pgrep -x cupsd && break;sleep 1;done"; + SCR::Execute(.target.bash, wait_for_daemon); + } + CUPS::server_hostname = ""; CUPS::SaveServerHostName (); CUPS::WriteCupsSettings (); @@ -1577,12 +1586,6 @@ // ret = Spooler::AdjustServices (size (printcap) > 0) && ret; if (with_daemon) { - // fixed #190173 - lpd printer doesn't get installed (in other MODEs cupsd already is running) - if (Mode::autoinst()) { - y2milestone("autoyast mode - starting CUPS"); - CUPS::StartDaemon(); - } - Progress::NextStage (); // delete old printers if (testAbort ()) return false; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org