Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/system-config-printer.git#ac095da151359262962f718bbc7faa4033862917

scp-dymo400.patch

@@ -0,0 +1,33 @@
+diff --git a/xml/preferreddrivers.xml b/xml/preferreddrivers.xml
+index 68269bf..004f61e 100644
+--- a/xml/preferreddrivers.xml
++++ b/xml/preferreddrivers.xml
+@@ -163,6 +163,10 @@
+       <ppdname match=".*splix"/>
+     </drivertype>
+ 
++    <drivertype name="dlw400">
++      <ppdname match="drv:///sample.drv/dymo.ppd" />
++    </drivertype>
++
+     <drivertype name="turboprint">
+       <ppdname match=".*turboprint"/>
+     </drivertype>
+@@ -293,6 +297,17 @@
+       </avoid>
+     </printer>
+ 
++    <printer>
++      <make-and-model match="DYMO LabelWriter 400" />
++      <deviceid>
++        <field name="MFG" match="DYMO" />
++        <field name="MDL" match="LabelWriter 400" />
++      </deviceid>
++      <drivers>
++        <drivertype>dlw400</drivertype>
++      </drivers>
++    </printer>
++
+     <printer>
+       <!-- For all printers -->
+       <drivers>

system-config-printer.spec

@@ -9,12 +9,13 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.5.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: https://github.com/%{username}/%{name}
 Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
 
 # all upstream patches, remove with new release
+Patch1: scp-dymo400.patch
 
 
 # gcc is no longer in buildroot by default
@@ -215,6 +216,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Fri Nov 27 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.13-2
+- set preferred driver for Dymo LabelWriter 400
+
 * Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.13-1
 - 1.15.13