diff --git a/hp-laserjet_cp_1025nw.ppd.gz b/hp-laserjet_cp_1025nw.ppd.gz new file mode 100644 index 0000000..94c0d6e --- /dev/null +++ b/hp-laserjet_cp_1025nw.ppd.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95adb9432739ec7bc22f7df991881a74774bbb63abce554fe8737d8e97f9fc95 +size 3147 diff --git a/hp-laserjet_professional_p_1102w.ppd.gz b/hp-laserjet_professional_p_1102w.ppd.gz new file mode 100644 index 0000000..a936c88 --- /dev/null +++ b/hp-laserjet_professional_p_1102w.ppd.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1027ad7fda5a3a488e81aef15cce0763048e619680bbe90c74720ad00f0881a7 +size 2507 diff --git a/hplip-3.21.10.tar.gz b/hplip-3.21.10.tar.gz new file mode 100644 index 0000000..dab90b3 --- /dev/null +++ b/hplip-3.21.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de230e1fdd1e718fc718417265612e0c882949e08fe045ee56f9f9882e6b6a60 +size 27309040 diff --git a/hplip-3.21.10.tar.gz.asc b/hplip-3.21.10.tar.gz.asc new file mode 100644 index 0000000..09c61ed --- /dev/null +++ b/hplip-3.21.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAmF7FyUACgkQc9dwzaWQR7lpqQCffzPBukXKeyZjUzR05YFGBSbh +FTMAoLIfJ1fVNlGuyellDriLzVE0sZZ/ +=36gK +-----END PGP SIGNATURE----- diff --git a/hplip-3.21.6.tar.gz b/hplip-3.21.6.tar.gz deleted file mode 100644 index c094d0e..0000000 --- a/hplip-3.21.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc3360d3d913684fb080db97a434b04be45e2cef23cc5bc4cbc5f64b0c5e7bca -size 27026295 diff --git a/hplip-3.21.6.tar.gz.asc b/hplip-3.21.6.tar.gz.asc deleted file mode 100644 index d28984c..0000000 --- a/hplip-3.21.6.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAmDek/UACgkQc9dwzaWQR7mvdgCeI5o1s7Zs1sfzpb5N8yqvUhK/ -EeQAniWRxzCREbLNPtwFLIXzTybYG4xG -=TDrU ------END PGP SIGNATURE----- diff --git a/hplip-missing-drivers.patch b/hplip-missing-drivers.patch index 7c3ca51..3507742 100644 --- a/hplip-missing-drivers.patch +++ b/hplip-missing-drivers.patch @@ -1,39 +1,3 @@ -diff --git a/Makefile.in b/Makefile.in -index 57b2812..250e2dc 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1542,6 +1542,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ - ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ - ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ - ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ -+ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \ - ppd/hpcups/hp-laserjet_m1005.ppd.gz \ - ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ - ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz \ -@@ -1655,6 +1656,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \ - ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ - ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \ - ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ -+ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ - ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ - ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ - ppd/hpcups/hp-neverstop_laser_100x.ppd.gz \ -@@ -3895,6 +3897,7 @@ dist_unrel_DATA = - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ -+@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m1005.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz \ -@@ -4007,6 +4010,7 @@ dist_unrel_DATA = - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \ -+@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ diff --git a/cups_drv.inc b/cups_drv.inc index 3863c52..50c570d 100644 --- a/cups_drv.inc @@ -45,7 +9,7 @@ index 3863c52..50c570d 100644 + ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \ ppd/hpcups/hp-laserjet_m1005.ppd.gz \ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ - ppd/hpcups/hp-laserjet_m1120_mfp.ppd.gz \ + ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \ @@ -510,6 +511,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ diff --git a/hplip-remove-imageprocessor.diff b/hplip-remove-imageprocessor.diff index 69d5edb..4bdd2af 100644 --- a/hplip-remove-imageprocessor.diff +++ b/hplip-remove-imageprocessor.diff @@ -7,9 +7,9 @@ diff -ur hplip-3.21.4.orig/Makefile.am hplip-3.21.4/Makefile.am -dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template - dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv - if !HPLIP_CLASS_DRIVER + dist_noinst_DATA += prnt/ipp-usb/HPLIP.conf + dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv @@ -595,7 +595,7 @@ prnt/hpcups/ImageProcessor.h @@ -33,6 +33,6 @@ diff -ur hplip-3.21.4.orig/Makefile.am hplip-3.21.4/Makefile.am - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ - fi - if !HPLIP_CLASS_DRIVER - # If scanner build, add hpaio entry to sane dll.conf. - if [ "$(scan_build)" = "yes" ]; then \ + if [ -d "/usr/share/ipp-usb/quirks/" ]; then \ + echo "ipp-usb directory exists"; \ + cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \ diff --git a/hplip.changes b/hplip.changes index a006379..4d887ea 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Sun Nov 7 15:43:43 UTC 2021 - Callum Farmer + +- Update to 3.21.10 + Added support for the following new printers: + * HP ENVY Inspire 7200e series + * HP ENVY Inspire 7900e series + * HP LaserJet MFP M140a + * HP LaserJet MFP M139a + * HP LaserJet MFP M141a + * HP LaserJet MFP M142a + * HP LaserJet MFP M140w + * HP LaserJet MFP M140we + * HP LaserJet MFP M139w + * HP LaserJet MFP M139we + * HP LaserJet MFP M141w + * HP LaserJet MFP M141we + * HP LaserJet MFP M142we + * HP LaserJet MFP M142w + * HP LaserJet M109a + * HP LaserJet M110a + * HP LaserJet M111a + * HP LaserJet M112a + * HP LaserJet M109w + * HP LaserJet M109we + * HP LaserJet M110w + * HP LaserJet M110we + * HP LaserJet M111w + * HP LaserJet M111we + * HP LaserJet M112we + * HP LaserJet M112w + * HP DesignJet Z6 Pro 64in + * HP DesignJet Z9 Pro 64in + * HP PageWide XL Pro 5200 PS MFP series + * HP PageWide XL Pro 8200 PS MFP series + * HP PageWide XL 3920 MFP + * HP PageWide XL 4200 Printer + * HP PageWide XL 4200 Multifunction Printer + * HP PageWide XL 4700 Printer + * HP PageWide XL 4700 Multifunction Printer + * HP PageWide XL 5200 Printer + * HP PageWide XL 5200 Multifunction Printer + * HP PageWide XL 8200 Printer + * HP Smart Tank 500 series + * HP Smart Tank 530 series + * HP Smart Tank Plus 570 series + * HP Smart Tank 7600 + * HP Smart Tank 750 + * HP Smart Tank 790 + * HP Smart Tank Plus 710-720 + * HP Smart Tank Plus 7000 + * HP Smart Tank Plus 660-670 + * HP Smart Tank Plus 6000 + * HP DeskJet Ink Advantage Ultra 4800 All-in-One Printer series +- Rebased hplip-missing-drivers.patch & don't edit Makefile.in +- Rebased hplip-remove-imageprocessor.diff +- Remove libtool archives +- Add drivers for hplip-missing-drivers.patch from Fedora + (lp#1843592,rh#1739855,rh#1740132,rh#1742949) + ------------------------------------------------------------------- Tue Aug 24 07:11:04 UTC 2021 - Martin Wilck diff --git a/hplip.spec b/hplip.spec index 2684b73..59d31f0 100644 --- a/hplip.spec +++ b/hplip.spec @@ -24,7 +24,7 @@ %define pyexe %{_bindir}/python3 %global use_qt5 1 Name: hplip -Version: 3.21.6 +Version: 3.21.10 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause AND GPL-2.0-or-later AND MIT @@ -45,6 +45,9 @@ Source2: hplip.keyring # Source100... is for special SUSE sources: # Source102 is a small man page for /usr/bin/hpijs: Source102: hpijs.1.gz +# Actual drivers for hplip-missing-drivers.patch +Source103: hp-laserjet_cp_1025nw.ppd.gz +Source104: hp-laserjet_professional_p_1102w.ppd.gz # Source1000: %{name}-rpmlintrc # Patch100... is for special Suse patches: @@ -331,6 +334,8 @@ sed -i 's,%{_bindir}/python\>,%{pyexe},' \ sed -i -e '/#!.*xdg-open$/d' \ -e 's|%{_datadir}/icons/Humanity/devices/48/printer.svg|printer|' hp-uiscan.desktop.in +cp -p %{SOURCE103} %{SOURCE104} ppd/hpcups + %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) # complains about missing files like NEWS, README, AUTHORS, ChangeLog @@ -550,6 +555,9 @@ popd install -d %{buildroot}%{_mandir}/man1 install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/ +# remove libtool archives +find "%{buildroot}" -type f -name "*.la" -delete -print + # Run fdupes: # The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content. # Never run fdupes carelessly over the whole buildroot directory @@ -717,8 +725,6 @@ exit 0 %{_libdir}/libhpipp.so %{_libdir}/libhpmud.so %{_libdir}/libhpdiscovery.so -%{_libdir}/*.la %{_libdir}/sane/libsane-hpaio.so -%{_libdir}/sane/*.la %changelog