Hello community,
here is the log from the commit of package yast2-printer
checked in at Mon May 7 14:43:32 CEST 2007.
--------
--- yast2-printer/yast2-printer.changes 2007-05-02 15:36:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2007-05-07 13:06:05.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 7 13:04:18 CEST 2007 - mzugec@suse.cz
+
+- include cups-drivers if needed (#218760)
+- 2.15.1
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.15.0.tar.bz2
New:
----
yast2-printer-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.t16890/_old 2007-05-07 14:42:30.000000000 +0200
+++ /var/tmp/diff_new_pack.t16890/_new 2007-05-07 14:42:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.15.0)
+# spec file for package yast2-printer (Version 2.15.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
# norootforbuild
Name: yast2-printer
-Version: 2.15.0
+Version: 2.15.1
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.15.0.tar.bz2
+Source0: yast2-printer-2.15.1.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
Requires: /usr/bin/host cups-libs
-Requires: cups >= 1.2
+#Requires: cups >= 1.2
Provides: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel
Obsoletes: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel
Provides: yast2-agent-cups-devel yast2-agent-printerdb-devel y2d_prnt y2t_prnt yast2-db-printer yast2-printerdb
@@ -34,7 +34,7 @@
%prep
-%setup -n yast2-printer-2.15.0
+%setup -n yast2-printer-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,9 @@
%doc %{prefix}/share/doc/packages/yast2-printer
%changelog
+* Mon May 07 2007 - mzugec@suse.cz
+- include cups-drivers if needed (#218760)
+- 2.15.1
* Wed May 02 2007 - mzugec@suse.cz
- superfluous slash in the printer list (#215197)
* Wed May 02 2007 - mzugec@suse.cz
++++++ yast2-printer-2.15.0.tar.bz2 -> yast2-printer-2.15.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.15.0/src/modules/CUPS.ycp new/yast2-printer-2.15.1/src/modules/CUPS.ycp
--- old/yast2-printer-2.15.0/src/modules/CUPS.ycp 2007-02-21 15:36:10.000000000 +0100
+++ new/yast2-printer-2.15.1/src/modules/CUPS.ycp 2007-05-07 13:05:24.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: CUPS.ycp 36338 2007-02-21 14:34:05Z mzugec $
+ * $Id: CUPS.ycp 37847 2007-05-07 11:05:14Z mzugec $
*
* Printer library exported functions. What else?!?
*/
@@ -144,7 +144,7 @@
}
-// functions related to the comoplex CUPS information reading/writing
+// functions related to the complex CUPS information reading/writing
/**
* If only client is installed or remote server to use is set,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.15.0/src/modules/Printerdb.ycp new/yast2-printer-2.15.1/src/modules/Printerdb.ycp
--- old/yast2-printer-2.15.0/src/modules/Printerdb.ycp 2007-02-06 12:50:22.000000000 +0100
+++ new/yast2-printer-2.15.1/src/modules/Printerdb.ycp 2007-05-07 13:05:24.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain 2002
*
- * $Id: Printerdb.ycp 35897 2007-02-06 11:48:36Z mzugec $
+ * $Id: Printerdb.ycp 37847 2007-05-07 11:05:14Z mzugec $
*
*/
@@ -354,29 +354,28 @@
_("The list of installed drivers has changed.
Building database of drivers..."));
}
- else
- {
- UI::OpenDialog (`VBox (
+ else if (Mode::autoinst()){
+ y2milestone("The list of installed drivers has changed.
+Building database of drivers...");
+ } else
+ {
+ UI::OpenDialog (`VBox (
`HSpacing (50),
`ProgressBar (`id(`pr),
// progress bar label
_("The list of installed drivers has changed.
Building database of drivers..."), 100, 0)));
- }
+ }
integer result = 0;
while (true)
{
result = (integer)SCR::Read (.ppd.db.creation_status);
- if (result < 0)
- break;
- if (result == 100)
- break;
- if (! Mode::commandline ())
- UI::ChangeWidget (`id (`pr), `Value, result);
+ if (result < 0) break;
+ if (result == 100) break;
+ if (! Mode::commandline () && !Mode::autoinst()) UI::ChangeWidget (`id (`pr), `Value, result);
sleep (1000);
}
- if (! Mode::commandline ())
- UI::CloseDialog ();
+ if (! Mode::commandline () && !Mode::autoinst() ) UI::CloseDialog ();
if (result < 0)
{
// error report
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.15.0/src/modules/Printerlib.ycp new/yast2-printer-2.15.1/src/modules/Printerlib.ycp
--- old/yast2-printer-2.15.0/src/modules/Printerlib.ycp 2007-05-02 15:32:18.000000000 +0200
+++ new/yast2-printer-2.15.1/src/modules/Printerlib.ycp 2007-05-07 13:05:24.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Petr Blahos
*
- * $Id: Printerlib.ycp 37785 2007-05-02 13:32:12Z mzugec $
+ * $Id: Printerlib.ycp 37847 2007-05-07 11:05:14Z mzugec $
*
* Printer library exported functions. What else?!?
*/
@@ -78,6 +78,7 @@
global void readHplip(){
hplip_before = false;
+//TODO: check if hplip package installed
if (Service::Status("hplip")==0) hplip_before = true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.15.0/src/modules/Printer.ycp new/yast2-printer-2.15.1/src/modules/Printer.ycp
--- old/yast2-printer-2.15.0/src/modules/Printer.ycp 2007-05-02 13:52:04.000000000 +0200
+++ new/yast2-printer-2.15.1/src/modules/Printer.ycp 2007-05-07 13:05:24.000000000 +0200
@@ -12,7 +12,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: Printer.ycp 37779 2007-05-02 11:51:58Z mzugec $
+ * $Id: Printer.ycp 37847 2007-05-07 11:05:14Z mzugec $
*
* Well we all know what modules are for.
*/
@@ -43,7 +43,7 @@
import "Stage";
import "SuSEFirewall";
import "URL";
-
+ import "PackageSystem";
@@ -1167,10 +1167,7 @@
* @return boolean success?
*/
global define boolean Read () ``{
- if (Arch::s390 ())
- skip_autodetection = true;
- if (Mode::config ())
- skip_autodetection = true;
+ if (Arch::s390 () || Mode::config()) skip_autodetection = true;
list<string> stages = [
// progress stage, text in dialog (short) (infinitive)
_("Check environment"),
@@ -1206,15 +1203,14 @@
Progress::NextStageStep (0); // step 0 - check root permission
if (testAbort ()) return false;
- if (! Confirm::MustBeRoot ())
- return false;
+ if (! Confirm::MustBeRoot ()) return false;
Progress::NextStep (); // step 1 - check installed spooler
- Printerlib::readHplip();
if (testAbort ()) return false;
- if (! checkSpooler ())
- return false;
+ Printerlib::readHplip();
+
+ if (! checkSpooler ()) return false;
Progress::NextStep (); // step 2 - check ghostscript package
if (testAbort ()) return false;
@@ -1548,10 +1544,14 @@
if (with_daemon && Spooler::Get () == "cups")
{
+
+ // #218760 - cups-drivers is not automatically included
+ if (size(printcap)>0) PackageSystem::CheckAndInstallPackagesInteractive([ "cups", "cups-drivers", "gutenprint" ]);
// fixed #190173 - lpd printer doesn't get installed (in other MODEs cupsd already is running)
+ Spooler::AdjustServices (size (printcap) > 0);
if (Mode::autoinst()) {
- y2milestone("autoyast mode - starting CUPS");
- CUPS::StartDaemon();
+// 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);
@@ -1569,7 +1569,6 @@
Progress::NextStage ();
// adjst services
- if (Spooler::AdjustServices (size (printcap) > 0)) return false;
if (with_daemon)
{
Progress::NextStage (); // delete old printers
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.15.0/testsuite/tests/cupsWrite.out new/yast2-printer-2.15.1/testsuite/tests/cupsWrite.out
--- old/yast2-printer-2.15.0/testsuite/tests/cupsWrite.out 2007-04-03 15:22:18.000000000 +0200
+++ new/yast2-printer-2.15.1/testsuite/tests/cupsWrite.out 2007-05-07 13:03:07.000000000 +0200
@@ -2,6 +2,10 @@
Read .target.size "/var/run/listen_remote_ipp.pid" 555
Read .target.string "/var/run/listen_remote_ipp.pid" ""
Execute .target.bash "kill -15 " 0
+Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0
+Read .init.scripts.exists "lpd" true
+Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0
Write .etc.cups.client_conf.value.ServerName nil true
Write .etc.cups.client_conf nil true
Execute .target.bash "cp /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old" 0
@@ -10,24 +14,48 @@
Write .etc.cups.cupsd_conf nil true
Execute .target.bash_output "diff /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old|grep -c ''" $["exit":0, "srderr":"", "stdout":""]
Execute .target.bash "rm /etc/cups/cupsd.conf.old" 0
+Write .cups.default_dest "" true
+Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[], "version":523] true
+Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0
Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0
Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0
-Read .init.scripts.exists "lpd" true
-Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0
-Return false
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0
+Execute .target.bash_output "/usr/bin/lpstat -v | /bin/grep -q ': hp:/'" $["exit":0, "srderr":"", "stdout":""]
+Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0
+Return true
Dump ====================================================
Read .target.size "/var/run/listen_remote_ipp.pid" 555
Read .target.string "/var/run/listen_remote_ipp.pid" ""
Execute .target.bash "kill -15 " 0
+Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0
+Read .init.scripts.exists "lpd" true
+Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0
Write .etc.cups.client_conf.value.ServerName nil true
Write .etc.cups.client_conf nil true
Execute .target.bash "cp /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old" 0
Write .etc.cups.cupsd_conf nil true
Execute .target.bash_output "diff /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old|grep -c ''" $["exit":0, "srderr":"", "stdout":""]
Execute .target.bash "rm /etc/cups/cupsd.conf.old" 0
+Write .cups.printers.remove "lpx" true
+Execute .target.bash "/bin/grep '#this database was generated during package building' /var/lib/YaST2/ppd_db.ycp" 0
+Read .ppd.db.changed false
+Read .target.ycp "/var/lib/YaST2/ppd_db.ycp" $["":$["":$["":$["filename":"filename"]]]]
+Read .target.tmpdir "/tmp"
+Write .ppd.file.modify ["filename", "/tmp/patched_ppd_lp", $[]] true
+Read .target.size "/tmp/patched_ppd_lp" 555
+Write .cups.printers.add $["accepting":true, "allowusers":[], "bannerend":"none", "bannerstart":"none", "changed":true, "default":true, "denyusers":[], "name":"lp", "ppd":"/tmp/patched_ppd_lp", "state":"idle", "uri":"parallel://dev/lp0"] true
+Write .cups.default_dest "lp" true
+Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[$["name":"lp", "uri":"parallel://dev/lp0"]], "version":523] true
+Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0
Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0
Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0
-Read .init.scripts.exists "lpd" true
-Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0
-Return false
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0
+Execute .target.bash_output "/usr/bin/lpstat -v | /bin/grep -q ': hp:/'" $["exit":0, "srderr":"", "stdout":""]
+Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0
+Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0
+Return true
Dump ====================================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.15.0/VERSION new/yast2-printer-2.15.1/VERSION
--- old/yast2-printer-2.15.0/VERSION 2007-05-02 13:51:02.000000000 +0200
+++ new/yast2-printer-2.15.1/VERSION 2007-05-07 13:03:59.000000000 +0200
@@ -1 +1 @@
-2.15.0
+2.15.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org