diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..f087b429e2f81a9f37b28a8308e2210f84df6c9b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..a9b277d54ae1295b1f11575e4e18a3faeeeefb25 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openeuler/hplip diff --git a/hplip-3.23.12.tar.gz b/hplip-3.23.12.tar.gz deleted file mode 100644 index 98ea463bc8ac2bf98a7e3110f33865147130b743..0000000000000000000000000000000000000000 Binary files a/hplip-3.23.12.tar.gz and /dev/null differ diff --git a/hplip-3.23.8.tar.gz b/hplip-3.23.8.tar.gz deleted file mode 100644 index 77b416a754d0b72e1ebce2e0b7f515b331812143..0000000000000000000000000000000000000000 Binary files a/hplip-3.23.8.tar.gz and /dev/null differ diff --git a/hplip-3.24.4.tar.gz b/hplip-3.24.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6444c2d9d63aee3ab9c062cafdbd5f7d765af4fd --- /dev/null +++ b/hplip-3.24.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d7643831893a5e2addf9d42d581a5dbfe5aaf023626886b8762c5645da0f1fb +size 30217933 diff --git a/hplip.spec b/hplip.spec index e2352a10d986e8e6c789ae4075478d33bbc06829..c0ab2df615649a119c5619190eec2994fce58d69 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,8 +1,8 @@ Name: hplip Summary: HP Linux Imaging and Printing Project -Version: 3.23.12 -Release: 2 -License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC +Version: 3.24.4 +Release: 1 +License: GPL-2.0-or-later AND MIT AND BSD-3-Clause AND IJG AND GPL-2.0-only AND LGPL-2.1-or-later AND BSD-2-Clause AND Public-Domain Url: https://developers.hp.com/hp-linux-imaging-and-printing Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%%{version}.tar.gz Source1: hpcups-update-ppds.sh @@ -75,29 +75,29 @@ drivers for HP printers and multi-function peripherals. %prep %setup -q -%patch1 -p1 -b .pstotiff-is-rubbish -%patch3 -p1 -b .ui-optional -%patch5 -p1 -b .deviceIDs-drv +%patch -P1 -p1 -b .pstotiff-is-rubbish +%patch -P3 -p1 -b .ui-optional +%patch -P5 -p1 -b .deviceIDs-drv chmod +x %{SOURCE2} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} %{SOURCE2} prnt/drv/hpcups.drv.in \ prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \ > prnt/drv/hpijs.drv.in -%patch6 -p1 -b .udev-rules -%patch7 -p1 -b .retry-open -%patch8 -p1 -b .snmp-quirks -%patch9 -p1 -b .hpijs-marker-supply -%patch10 -p1 -b .clear-old-state-reasons -%patch11 -p1 -b .hpcups-sigpipe -%patch12 -p1 -b .logdir -%patch13 -p1 -b .bad-low-ink-warning +%patch -P6 -p1 -b .udev-rules +%patch -P7 -p1 -b .retry-open +%patch -P8 -p1 -b .snmp-quirks +%patch -P9 -p1 -b .hpijs-marker-supply +%patch -P10 -p1 -b .clear-old-state-reasons +%patch -P11 -p1 -b .hpcups-sigpipe +%patch -P12 -p1 -b .logdir +%patch -P13 -p1 -b .bad-low-ink-warning for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz done -%patch14 -p1 -b .deviceIDs-ppd +%patch -P14 -p1 -b .deviceIDs-ppd for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4); do gzip -n ${ppd_file#*/} @@ -107,37 +107,37 @@ for ppd_file in $(grep '^diff' %{PATCH15} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz done -%patch15 -p1 -b .ImageableArea +%patch -P15 -p1 -b .ImageableArea for ppd_file in $(grep '^diff' %{PATCH15} | cut -d " " -f 4); do gzip -n ${ppd_file#*/} done -%patch16 -p1 -b .scan-tmp -%patch17 -p1 -b .log-stderr -%patch18 -p1 -b .parsing -%patch20 -p1 -b .dj990c-margin -%patch21 -p1 -b .strncpy -%patch22 -p1 -b .no-write-bytecode -%patch23 -p1 -b .silence-ioerror -%patch24 -p1 -b .sourceoption -%patch25 -p1 -b .no-ernie +%patch -P16 -p1 -b .scan-tmp +%patch -P17 -p1 -b .log-stderr +%patch -P18 -p1 -b .parsing +%patch -P20 -p1 -b .dj990c-margin +%patch -P21 -p1 -b .strncpy +%patch -P22 -p1 -b .no-write-bytecode +%patch -P23 -p1 -b .silence-ioerror +%patch -P24 -p1 -b .sourceoption +%patch -P25 -p1 -b .no-ernie rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h -%patch27 -p1 -b .check-cups -%patch30 -p1 -b .typo +%patch -P27 -p1 -b .check-cups +%patch -P30 -p1 -b .typo -%patch31 -p1 -b .use-binary-str -%patch32 -p1 -b .colorlaserjet-mfp-m278-m281 -%patch33 -p1 -b .error-print-fix -%patch34 -p1 -b .hpfax-import-error-print +%patch -P31 -p1 -b .use-binary-str +%patch -P32 -p1 -b .colorlaserjet-mfp-m278-m281 +%patch -P33 -p1 -b .error-print-fix +%patch -P34 -p1 -b .hpfax-import-error-print -%patch35 -p1 -b .libimageprocessor-removal +%patch -P35 -p1 -b .libimageprocessor-removal %{_bindir}/rm prnt/hpcups/libImageProcessor-x86* -%patch36 -p1 -b .qmsgbox-typos-fix -%patch37 -p1 -b .toolbox-crash +%patch -P36 -p1 -b .qmsgbox-typos-fix +%patch -P37 -p1 -b .toolbox-crash sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ @@ -175,6 +175,7 @@ export LDFLAGS="${LDFLAGS} -fPIC" %install install -d ${RPM_BUILD_ROOT}%{_bindir} %make_install DESTDIR=${RPM_BUILD_ROOT} PYTHON=%{__python3} +%delete_la install -d ${RPM_BUILD_ROOT}/run/hplip install -d ${RPM_BUILD_ROOT}%{_sharedstatedir}/hp @@ -185,6 +186,10 @@ d /run/hplip 0775 root lp - EOF # Remove unpackaged files +rm -rf %{buildroot}%{_sysconfdir}/sane.d \ + %{buildroot}%{_docdir} \ + %{buildroot}%{_datadir}/hal/fdi + rm -f %{buildroot}%{_bindir}/hp-logcapture \ %{buildroot}%{_bindir}/hp-doctor \ %{buildroot}%{_bindir}/hp-pqdiag \ @@ -201,6 +206,10 @@ rm -rf %{buildroot}%{_datadir}/hplip/install.* \ rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template +rm -f %{buildroot}%{_unitdir}/hplip-printer@.service + +rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop + install -d ${RPM_BUILD_ROOT}%{_datadir}/appdata cp -a %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/appdata/ install -d ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps @@ -240,10 +249,8 @@ install -d ${RPM_BUILD_ROOT}%{_datadir}/hplip/prnt/plugins %license COPYING %{_bindir}/* %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/data %{_datadir}/%{name}/* %{_datadir}/cups/* -%{_datadir}/cups/mime/pstotiff.convs %{_datadir}/applications/*.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/*/apps/* @@ -261,25 +268,19 @@ install -d ${RPM_BUILD_ROOT}%{_datadir}/hplip/prnt/plugins %config(noreplace) %{_sysconfdir}/hp/%{name}.conf %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio -%exclude %{_datadir}/%{name}/pkservice.py -%exclude %{_datadir}/%{name}/dat2drv* -%exclude %{_datadir}/%{name}/fax/pstotiff* -%exclude %{_datadir}/hal/fdi -%exclude %{_datadir}/applications/%{name}.desktop -%exclude %{_datadir}/cups/mime/pstotiff.types -%exclude %{_docdir} -%exclude %{_bindir}/hp-pkservice -%exclude %{_libdir}/*.la -%exclude %{_libdir}/libhpip.so -%exclude %{_libdir}/libhpipp.so -%exclude %{_libdir}/libhpdiscovery.so -%exclude %{_libdir}/sane/*.la -%exclude %{_unitdir}/%{name}-printer@.service -%exclude %{_sysconfdir}/xdg/autostart/%{name}-systray.desktop -%exclude %{_sysconfdir}/sane.d -%exclude %{python3_sitearch}/*.la - %changelog +* Wed Apr 09 2025 yaoxin <1024769339@qq.com> - 3.24.4-1 +- Update to 3.24.4: + - Added support for new printers: + * HP OfficeJet 8120 All-in-One series + * HP OfficeJet Pro 8120 All-in-One series + * HP OfficeJet 8130 All-in-One series + * HP OfficeJet Pro 8130 All-in-One series + * HP OfficeJet Pro 9720 Series + * HP OfficeJet Pro 9730 Series + - Bug fixes: + * hpmud: sanitize printer serial number + * Tue Feb 11 2025 xu_ping <707078654@qq.com> - 3.23.12-2 - fix self build failed.