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.24.4.tar.gz similarity index 76% rename from hplip-3.23.8.tar.gz rename to hplip-3.24.4.tar.gz index 77b416a754d0b72e1ebce2e0b7f515b331812143..e001905407da0d09328ee4bd43adadb31aca81ac 100644 Binary files a/hplip-3.23.8.tar.gz and b/hplip-3.24.4.tar.gz differ diff --git a/hplip.spec b/hplip.spec index ac29176a6adb5801e006c8f18bfde5be8909c7d8..01bd69e8bbc6785a024101144371de4f67b15cf5 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,8 +1,8 @@ Name: hplip Summary: HP Linux Imaging and Printing Project -Version: 3.23.12 +Version: 3.24.4 Release: 1 -License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC +License: GPL-2.0-or-later AND MIT AND BSD-3-Clause-HP AND IJG AND GPL-2.0-only AND LGPL-2.1-or-later AND BSD-2-Clause AND python-ldap 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,28 @@ 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 -chmod +x %{SOURCE2} +%patch -P1 -p1 -b .pstotiff-is-rubbish +%patch -P3 -p1 -b .ui-optional +%patch -P5 -p1 -b .deviceIDs-drv mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} -%{SOURCE2} prnt/drv/hpcups.drv.in \ +%{__python3} %{S:2} 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 +106,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,' \ @@ -157,9 +156,6 @@ sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in autoreconf --verbose --force --install -export CFLAGS="%{optflags} $(python3-config --includes)" -export CXXFLAGS="%{optflags} $(python3-config --includes)" - %configure \ --enable-scan-build --enable-gui-build --enable-fax-build \ --disable-foomatic-rip-hplip-install --enable-pp-build \ @@ -174,6 +170,7 @@ export CXXFLAGS="%{optflags} $(python3-config --includes)" %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 @@ -196,12 +193,24 @@ rm -rf %{buildroot}%{_datadir}/hplip/install.* \ %{buildroot}%{_bindir}/hp-uninstall \ %{buildroot}%{_datadir}/hplip/upgrade.* \ %{buildroot}%{_bindir}/hp-upgrade \ - %{buildroot}%{_datadir}/hplip/hplip-install + %{buildroot}%{_datadir}/hplip/hplip-install \ + %{buildroot}%{_bindir}/hp-pkservice \ + %{buildroot}%{_datadir}/%{name}/pkservice.py + +rm -rf %{buildroot}%{_libdir}/*.so \ + %{buildroot}%{_datadir}/%{name}/dat2drv* \ + %{buildroot}%{_datadir}/%{name}/fax/pstotiff* \ + %{buildroot}%{_datadir}/hal/fdi \ + %{buildroot}%{_datadir}/cups/mime/pstotiff.types \ + %{buildroot}%{_unitdir}/%{name}-printer@.service \ + %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-systray.desktop rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template +rm -rf %{buildroot}%{_sysconfdir}/sane.d %{buildroot}%{_docdir} + install -d ${RPM_BUILD_ROOT}%{_datadir}/appdata -cp -a %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/appdata/ +cp -a %{S:3} ${RPM_BUILD_ROOT}%{_datadir}/appdata/ install -d ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps pushd ${RPM_BUILD_ROOT}%{_datadir} @@ -210,45 +219,29 @@ install -p -m644 hplip/data/images/32x32/hp_logo.png icons/hicolor/32x32/apps/hp install -p -m644 hplip/data/images/64x64/hp_logo.png icons/hicolor/64x64/apps/hp_logo.png popd -install -d ${RPM_BUILD_ROOT}%{_datadir}/applications -sed -i -e '/^Categories=/d' hplip.desktop -sed -i -e '/^Encoding=/d' hplip.desktop -desktop-file-validate hplip.desktop -desktop-file-install --vendor HP --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications --add-category System \ - --add-category Settings --add-category HardwareSettings hplip.desktop appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/*.appdata.xml -install -p -m755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/hpcups-update-ppds +install -p -m755 %{S:1} ${RPM_BUILD_ROOT}%{_bindir}/hpcups-update-ppds install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sane.d/dll.d echo hpaio > ${RPM_BUILD_ROOT}%{_sysconfdir}/sane.d/dll.d/hpaio find doc/images -type f -exec chmod 644 {} \; install -d ${RPM_BUILD_ROOT}%{_datadir}/hplip/prnt/plugins -%pre -%{_bindir}/systemctl start cups &>/dev/null ||: -%{_bindir}/systemctl enable cups &>/dev/null ||: - %post %{_bindir}/hpcups-update-ppds &>/dev/null ||: -/sbin/ldconfig - -%postun -/sbin/ldconfig %files %doc COPYING doc/* %license COPYING %{_bindir}/* -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/data -%{_datadir}/%{name}/* +%{_datadir}/%{name} %{_datadir}/cups/* -%{_datadir}/cups/mime/pstotiff.convs %{_datadir}/applications/*.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/ppd -%{_libdir}/*so* -%{_libdir}/sane/*so* +%{_libdir}/*.so.* +%{_libdir}/sane/*.so.* +%{_libdir}/sane/*.so %{python3_sitearch}/* %{_cups_serverbin}/backend/* %{_cups_serverbin}/filter/* @@ -260,25 +253,10 @@ 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 +* Sun Aug 11 2024 Funda Wang - 3.24.4-1 +- update to 3.24.4 + * Thu Mar 14 2024 xu_ping <707078654@qq.com> - 3.23.12-1 - Upgrade to 3.23.12