Add .gitignore and .gitea/workflows/ci.yml

.gitea/workflows/ci.yml

@@ -13,4 +13,5 @@ jobs:
         with:
           CI_DEPLOY: ${{ secrets.CI_DEPLOY }}
           PUBLICATOR: ${{ secrets.PUBLICATOR }}
+          REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }}
 

hplip.spec

@@ -19,12 +19,13 @@
 
 Summary:	HP printer/all-in-one driver infrastructure
 Name:		hplip
-Version:	3.16.11
-Release:	15
+Version:	3.20.6
+Release:	1
 License:	GPLv2+ and MIT
 Group:		System/Printing
 Url:		http://hplip.sourceforge.net/
-Source0:	http://garr.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz
+#Source0:	http://garr.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz
+Source0:    https://sourceforge.net/projects/hplip/files/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:	hpcups-update-ppds.sh
 Source2:	copy-deviceids.py
 # http://www.iconfinder.com/icondetails/6393/128/fax_hardware_icon
@@ -85,6 +86,7 @@ BuildRequires:	polkit
 BuildRequires:	python-sip >= 4.1.1
 BuildRequires:	net-snmp-devel
 BuildRequires:	cups-devel
+BuildRequires:  cups-common
 BuildRequires:	jpeg-devel
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(libgphoto2)
@@ -282,21 +284,21 @@ flash memory cards.
 %prep
 %setup -qn %{name}-%{version}%{extraversion}
 
-%patch2 -p1 -b .udev-rules-on-action-change
+#patch2 -p1 -b .udev-rules-on-action-change
 
 # Fedora patches
 
 # The pstotiff filter is rubbish so replace it (launchpad #528394).
-%patch101 -p1 -b .pstotiff-is-rubbish
+#patch101 -p1 -b .pstotiff-is-rubbish
 
 # Fix compilation.
-%patch102 -p1 -b .strstr-const
+#patch102 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (RH bug #243273).
 # % patch103 -p1 -b .ui-optional
 
 # Make sure to avoid handwritten asm.
-%patch104 -p1 -b .no-asm
+#patch104 -p1 -b .no-asm
 
 # Corrected several IEEE 1284 Device IDs using foomatic data.
 # Color LaserJet CM1312nfi (bug #581005)
@@ -325,7 +327,7 @@ flash memory cards.
 # LaserJet Professional P1102w (bug #795958)
 # Color LaserJet CM4540 MFP (bug #968177)
 # Color LaserJet cp4005 (bug #980976)
-%patch105 -p1 -b .ids
+#patch105 -p1 -b .ids
 
 chmod +x %{SOURCE2}
 mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
@@ -351,117 +353,114 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
 # Designjet T770 (bug #747957)
 # Color LaserJet CM4540 MFP (bug #968177)
 # Color LaserJet cp4005 (bug #980976)
-for ppd_file in $(grep '^diff' %{PATCH107} | cut -d " " -f 4);
-do
-  gunzip ${ppd_file#*/}.gz
-done
+#for ppd_file in $(grep '^diff' %{PATCH107} | cut -d " " -f 4);
+#do
+#  gunzip ${ppd_file#*/}.gz
+#done
 
-%patch107 -p1 -b .deviceIDs-ppd
-for ppd_file in $(grep '^diff' %{PATCH107} | cut -d " " -f 4);
-do
-  gzip -n ${ppd_file#*/}
-done
+#patch107 -p1 -b .deviceIDs-ppd
+#for ppd_file in $(grep '^diff' %{PATCH107} | cut -d " " -f 4);
+#do
+#  gzip -n ${ppd_file#*/}
+#done
 
 
 # Retry when connecting to device fails (RH bug #532112).
-%patch108 -p1 -b .retry-open
+#patch108 -p1 -b .retry-open
 
 # Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (RH bug #581825).
-%patch109 -p1 -b .snmp-quirks
+#patch109 -p1 -b .snmp-quirks
 
 # Fixed bogus low ink warnings from hpijs driver (RH bug #643643).
-%patch111 -p1 -b .hpijs-marker-supply
+#patch111 -p1 -b .hpijs-marker-supply
 
 # Clear old printer-state-reasons we used to manage (RH bug #510926).
-%patch112 -p1 -b .clear-old-state-reasons
+#patch112 -p1 -b .clear-old-state-reasons
 
 # Avoid busy loop in hpcups when backend has exited (RH bug #525944).
-%patch114 -p1 -b .hpcups-sigpipe
+#patch114 -p1 -b .hpcups-sigpipe
 
-%patch115 -p1 -b .logdir
+#patch115 -p1 -b .logdir
 
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (RH bug #510926).
-%patch116 -p1 -b .bad-low-ink-warning
+#patch116 -p1 -b .bad-low-ink-warning
 
 # Fix ImageableArea for Laserjet 8150/9000 (RH bug #596298).
-for ppd_file in $(grep '^diff' %{PATCH121} | cut -d " " -f 4);
-do
-  gunzip ${ppd_file#*/}.gz
-done
-%patch121 -p1 -b .ImageableArea
-for ppd_file in $(grep '^diff' %{PATCH121} | cut -d " " -f 4);
-do
-  gzip -n ${ppd_file#*/}
-done
+#for ppd_file in $(grep '^diff' %{PATCH121} | cut -d " " -f 4);
+#do
+#  gunzip ${ppd_file#*/}.gz
+#done
+#patch121 -p1 -b .ImageableArea
+#for ppd_file in $(grep '^diff' %{PATCH121} | cut -d " " -f 4);
+#do
+#  gzip -n ${ppd_file#*/}
+#done
 
 # Don't run 'chgrp lp /var/log/hp' in makefile (removes all lines with "chgrp")
-sed -i '/chgrp/d' Makefile.am
+#sed -i '/chgrp/d' Makefile.am
 
-sed -i.duplex-constraints \
-    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
-    prnt/drv/hpcups.drv.in
+#sed -i.duplex-constraints \
+#    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
+#    prnt/drv/hpcups.drv.in
 
 # Removed SYSFS use in udev rules and actually made them work (bug #560754).
 # Move udev rules to /lib/udev/rules.d (bug #748208).
-%patch134 -p1 -b .udev-rules
+#patch134 -p1 -b .udev-rules
 
 # Debian/Ubuntu patches
 
 # This patch tries to make sure that black is printed with just
 # the black pen, if the printer supports it
-%patch201 -p1 -b .01_rss
+#patch201 -p1 -b .01_rss
 
 # code cleanup related to char signedness
-%patch203 -p1 -b .14_charsign
+#patch203 -p1 -b .14_charsign
 
 # compiling ui files to py
-%patch204 -p1 -b .85_rebuild_python_ui
+#patch204 -p1 -b .85_rebuild_python_ui
 
 # Corrections on the models.dat entry for the HP PhotoSmart Pro B9100,
 # especially for the correct color calibration mode.
-%patch206 -p1 -b .hplip-photosmart_b9100_support
+#patch206 -p1 -b .hplip-photosmart_b9100_support
 
 # Fixes Short-edge duplex printing if duplex is PJL-controlled
 # https://bugs.launchpad.net/hplip/+bug/244295
-%patch207 -p1 -b .hplip-pjl-duplex-binding
+#patch207 -p1 -b .hplip-pjl-duplex-binding
 
 # https://bugs.launchpad.net/debian/+source/hplip/+bug/530746
-%patch209 -p1 -b .hp-check-groups
+#patch209 -p1 -b .hp-check-groups
 
-%patch210 -p1 -b .plasma
+#patch210 -p1 -b .plasma
 
-%patch220 -p1 -b .add-lidil-two-cartridge-modes
+#patch220 -p1 -b .add-lidil-two-cartridge-modes
 
-%patch225 -p1 -b .hpfax-bug-function-used-before-importing-log
+#patch225 -p1 -b .hpfax-bug-function-used-before-importing-log
 
-%patch226 -p1 -b .hp-systray-make-menu-title-visible-in-sni-qt-indicator
+#patch226 -p1 -b .hp-systray-make-menu-title-visible-in-sni-qt-indicator
 
-%patch227 -p1 -b .hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde
+#patch227 -p1 -b .hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde
 
-%patch228 -p1 -b .hpaio-option-duplex
+#patch228 -p1 -b .hpaio-option-duplex
 
-%patch301 -p1
+#patch301 -p1
 
-%patch302 -p0
+#patch302 -p0
 
-%patch303 -p1
+#patch304 -p1
 
-%patch304 -p1
+#patch305 -p1
 
-%patch305 -p1
 
-%patch400 -p1
-
-sed -i.duplex-constraints \
-    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
-    prnt/drv/hpcups.drv.in
+#sed -i.duplex-constraints \
+#    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
+#    prnt/drv/hpcups.drv.in
 
 # Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351).
-find -name '*.py' -print0 | xargs -0 \
-    sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,'
+#find -name '*.py' -print0 | xargs -0 \
+#    sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,'
 
-sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,' \
-    fax/filters/pstotiff
+#sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,' \
+#    fax/filters/pstotiff
 
 
 # Make all files in the source user-writable
@@ -475,12 +474,12 @@ cp -a . ../compat-libs
 %serverbuild
 #needed by patches 204 and 205
 # create required files as placeholder, otherwise autoreconf fails
-touch NEWS README AUTHORS ChangeLog
-autoreconf -ifv
+#touch NEWS README AUTHORS ChangeLog
+#autoreconf -ifv
 
 pushd ../compat-libs
 # create required files as placeholder, otherwise autoreconf fails
-touch NEWS README AUTHORS ChangeLog
+#touch NEWS README AUTHORS ChangeLog
 autoreconf -ifv
 %configure2_5x PYTHON=/usr/bin/python2
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -508,8 +507,8 @@ WITHOUT_SANE="--without-sane"
 	--with-mimedir=%{_datadir}/cups/mime \
 	PYTHON=/usr/bin/python3
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %make