Hello community,
here is the log from the commit of package yast2-samba-server for
openSUSE:Factory checked in at 2014-07-28 06:31:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes
2014-07-15 16:25:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes
2014-07-28 06:31:17.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 25 12:27:04 UTC 2014 - [email protected]
+
+- Ensure CUPS is installed if printer sharing is configured; (bnc#873703).
+- 3.1.10
+
+-------------------------------------------------------------------
@@ -2,0 +9 @@
+
Old:
----
yast2-samba-server-3.1.9.tar.bz2
New:
----
yast2-samba-server-3.1.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.bdPiGE/_old 2014-07-28 06:31:18.000000000 +0200
+++ /var/tmp/diff_new_pack.bdPiGE/_new 2014-07-28 06:31:18.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.1.9
+Version: 3.1.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-samba-server-3.1.9.tar.bz2 -> yast2-samba-server-3.1.10.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.9/package/yast2-samba-server.changes
new/yast2-samba-server-3.1.10/package/yast2-samba-server.changes
--- old/yast2-samba-server-3.1.9/package/yast2-samba-server.changes
2014-07-04 16:43:29.000000000 +0200
+++ new/yast2-samba-server-3.1.10/package/yast2-samba-server.changes
2014-07-25 14:33:08.000000000 +0200
@@ -1,5 +1,12 @@
-------------------------------------------------------------------
-Thu Jul 6 11:45:53 UTC 2014 - [email protected]
+Fri Jul 25 12:27:04 UTC 2014 - [email protected]
+
+- Ensure CUPS is installed if printer sharing is configured; (bnc#873703).
+- 3.1.10
+
+-------------------------------------------------------------------
+Thu Jul 6 11:45:53 UTC 2014 - [email protected]
+
- Fix duplicated 'Firewall Settings' string on Startup tab; (bnc#884058)
- 3.1.9
@@ -7,7 +14,7 @@
Tue May 6 05:34:49 UTC 2014 - [email protected]
- Adapted testsuite to last changes in Service module.
-- 3.1.8
+- 3.1.8
-------------------------------------------------------------------
Tue Apr 22 15:49:38 CEST 2014 - [email protected]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-server-3.1.9/package/yast2-samba-server.spec
new/yast2-samba-server-3.1.10/package/yast2-samba-server.spec
--- old/yast2-samba-server-3.1.9/package/yast2-samba-server.spec
2014-07-04 16:43:29.000000000 +0200
+++ new/yast2-samba-server-3.1.10/package/yast2-samba-server.spec
2014-07-25 14:33:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 3.1.9
+Version: 3.1.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-server-3.1.9/src/modules/SambaServer.pm
new/yast2-samba-server-3.1.10/src/modules/SambaServer.pm
--- old/yast2-samba-server-3.1.9/src/modules/SambaServer.pm 2014-07-04
16:43:29.000000000 +0200
+++ new/yast2-samba-server-3.1.10/src/modules/SambaServer.pm 2014-07-25
14:33:08.000000000 +0200
@@ -74,6 +74,8 @@
my $RequiredPackages = ["samba", "samba-client"];
# ... or another packages (BNC #657414)
my $RequiredPackages_gplv3 = ["samba-gplv3", "samba-gplv3-client"];
+# cups packages needed for printer sharing
+my $CupsPackages = ["cups"];
my $GlobalsConfigured = 0;
@@ -97,9 +99,9 @@
|| SambaAccounts->GetModified();
};
-# Check that packages are installed or offer their installation
+# Check that base packages are installed or offer their installation
BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] }
-sub CheckAndInstallPackages {
+sub CheckAndInstallBasePackages {
# installed_required_packages? or installed_packages_gplv3? or
install_packages!
PackageSystem->InstalledAll($RequiredPackages) ||
PackageSystem->InstalledAll($RequiredPackages_gplv3) ||
@@ -108,6 +110,22 @@
return 1;
}
+BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] }
+sub CheckAndInstallCupsPackages {
+ my $printing = SambaConfig->GlobalGetStr("printing", "cups");
+
+ unless ((lc $printing eq "cups") and SambaConfig->ShareExists("printers"))
{
+ # not sharing cups printers, package not needed
+ return 1;
+ }
+
+ if (PackageSystem->InstalledAll($CupsPackages)) {
+ return 1;
+ }
+
+ return PackageSystem->CheckAndInstallPackagesInteractive($CupsPackages);
+}
+
# Read all samba-server settings
# @param force_reread force reread configuration
# @param no_progreass_bar disable progress bar
@@ -160,9 +178,12 @@
Progress->NextStage();
# check installed packages
unless (Mode->test()) {
- CheckAndInstallPackages() or return 0;
+ CheckAndInstallBasePackages() or return 0;
}
SambaConfig->Read();
+ unless (Mode->test()) {
+ CheckAndInstallCupsPackages() or return 0;
+ }
Samba->ReadSharesSetting();
# 2: read samba secrets
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
