Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hplip for openSUSE:Factory checked
in at 2021-03-02 14:43:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hplip (Old)
and /work/SRC/openSUSE:Factory/.hplip.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip"
Tue Mar 2 14:43:14 2021 rev:137 rq:874884 version:3.20.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2021-01-15
19:44:34.833873808 +0100
+++ /work/SRC/openSUSE:Factory/.hplip.new.2378/hplip.changes 2021-03-02
15:16:56.849598369 +0100
@@ -1,0 +2,16 @@
+Tue Feb 23 17:23:15 UTC 2021 - Martin Wilck <mwi...@suse.com>
+
+- Remove %is_opensuse from spec file (jsc#SLE-11640)
+ This will build hp-scan-utils package on SLE, too, where it
+ has unsatisfiable dependencies.
+
+-------------------------------------------------------------------
+Sun Feb 14 22:34:21 UTC 2021 - Stephan Hemeier <sauerlandli...@gmx.de>
+
+ * add hplip-missing-drivers.patch (lp#1843592)
+ Now working:
+ HP Laserjet Professional P1102w
+ HP LaserJet 100 ColorMFP M175nw
+ HP Laserjet CP 1025nw
+
+-------------------------------------------------------------------
New:
----
hplip-missing-drivers.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hplip.spec ++++++
--- /var/tmp/diff_new_pack.X3aXwg/_old 2021-03-02 15:16:57.549598955 +0100
+++ /var/tmp/diff_new_pack.X3aXwg/_new 2021-03-02 15:16:57.553598959 +0100
@@ -84,6 +84,7 @@
Patch402: hplip-change-pgp-server.patch
# boo#1107711
Patch403: Revert-changes-from-3.18.5-that-break-hp-setup-for-f.patch
+Patch500: hplip-missing-drivers.patch
BuildRequires: %{pymod devel}
BuildRequires: %{pymod qt5-devel}
BuildRequires: %{pymod xml}
@@ -319,7 +320,7 @@
%patch401 -p1
%patch402 -p1
%patch403 -p1
-
+%patch500 -p1
# replace "env" shebang and "/usr/bin/python" with real executable
find . -name '*.py' -o -name pstotiff | \
xargs -n 1 sed -i '1s,^#!\(%{_bindir}/env
python\|%{_bindir}/python\),#!%{pyexe},'
@@ -396,24 +397,6 @@
%install
%make_install
-# SLE does not provide python-pillow (PIL) (bsc#1131613) and thus has no
hp-scan
-# and related library code.
-# We can't use --disable-scan-build, as that would disable the SANE
-# backend, too.
-# On openSUSE, these files go into the hplip-scan package (see below).
-# Remove these before running pyX_compile
-%if !0%{?is_opensuse}
-rm -f %{buildroot}%{_datadir}/hplip/scan.py \
- %{buildroot}%{_datadir}/hplip/uiscan.py \
- %{buildroot}%{_datadir}/hplip/base/imageprocessing.py \
- %{buildroot}%{_datadir}/hplip/ui5/scandialog.py \
- %{buildroot}%{_bindir}/hp-scan \
- %{buildroot}%{_bindir}/hp-uiscan \
- %{buildroot}%{_datadir}/applications/hp-uiscan.desktop \
- %{buildroot}%{_libdir}/python%{pyver}/site-packages/scanext.*
-rm -rf %{buildroot}%{_datadir}/hplip/scan
-%endif
-
# Make and install Python compiled bytecode files
%py3_compile %{buildroot}%{_datadir}/hplip
%py3_compile -O %{buildroot}%{_datadir}/hplip
@@ -555,9 +538,7 @@
popd
# Replace the invalid Desktop categories
%suse_update_desktop_file -r
%{buildroot}%{_datadir}/applications/hplip.desktop System HardwareSettings
-%if 0%{?is_opensuse}
%suse_update_desktop_file -r
%{buildroot}%{_datadir}/applications/hp-uiscan.desktop System HardwareSettings
-%endif
# Let suse_update_desktop_file add X-SuSE-translate key to
/etc/xdg/autostart/hplip-systray.desktop
# so that we can update its translations with translation-only packages.
@@ -675,7 +656,6 @@
# The scanning utils depend on PIL and python3-scikit-image,
# which are not available in SLE
-%if 0%{?is_opensuse}
%files scan-utils
%{_datadir}/applications/hp-uiscan.desktop
%{_libdir}/python%{pyver}/site-packages/scanext.*
@@ -690,7 +670,6 @@
%{_datadir}/hplip/__pycache__/scan.*
%{_datadir}/hplip/base/__pycache__/imageprocessing.*
%{_datadir}/hplip/ui5/__pycache__/scandialog.*
-%endif
%files hpijs
%config %{_sysconfdir}/hp/
++++++ hplip-missing-drivers.patch ++++++
++++ 606 lines (skipped)
