diff --git a/.gitignore b/.gitignore index f174f38..54adadb 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ hplip-3.10.6.tar.gz /hplip-3.15.6.tar.gz /hplip-3.15.7.tar.gz /hplip-3.15.9.tar.gz +/hplip-3.15.11.tar.gz diff --git a/hplip-3.15.11.tar.gz.asc b/hplip-3.15.11.tar.gz.asc new file mode 100644 index 0000000..ff6b378 --- /dev/null +++ b/hplip-3.15.11.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlZEazsACgkQc9dwzaWQR7m3UACgg+Msyrw5eUu3E3fYuWbLzEE6 +9bgAnic5tdUXV8L6kYmUUyAnr8MlJ6WU +=zfDs +-----END PGP SIGNATURE----- diff --git a/hplip-3.15.9.tar.gz.asc b/hplip-3.15.9.tar.gz.asc deleted file mode 100644 index 940e964..0000000 --- a/hplip-3.15.9.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlX2z8EACgkQc9dwzaWQR7mrjQCg1MPmG47ae3zvUk/N9ttQNAsq -ZH4AoOa9lePyg+gH5dvMf//5Pv9IDRRN -=7lGg ------END PGP SIGNATURE----- diff --git a/hplip-no-write-bytecode.patch b/hplip-no-write-bytecode.patch index acf9d89..8bd1200 100644 --- a/hplip-no-write-bytecode.patch +++ b/hplip-no-write-bytecode.patch @@ -1,18 +1,18 @@ -diff -up hplip-3.15.9/config_usb_printer.py.no-write-bytecode hplip-3.15.9/config_usb_printer.py ---- hplip-3.15.9/config_usb_printer.py.no-write-bytecode 2015-10-23 15:42:45.252723455 +0100 -+++ hplip-3.15.9/config_usb_printer.py 2015-10-23 15:43:06.695592567 +0100 +diff -up hplip-3.15.11/config_usb_printer.py.no-write-bytecode hplip-3.15.11/config_usb_printer.py +--- hplip-3.15.11/config_usb_printer.py.no-write-bytecode 2015-11-16 10:50:03.127459222 +0100 ++++ hplip-3.15.11/config_usb_printer.py 2015-11-16 10:53:52.266931490 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python -B # -*- coding: utf-8 -*- # - # (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. -diff -up hplip-3.15.9/fax/backend/hpfax.py.no-write-bytecode hplip-3.15.9/fax/backend/hpfax.py ---- hplip-3.15.9/fax/backend/hpfax.py.no-write-bytecode 2015-10-23 15:42:21.180873748 +0100 -+++ hplip-3.15.9/fax/backend/hpfax.py 2015-10-23 15:42:21.189873691 +0100 + # (c) Copyright 2011-2015 HP Development Company, L.P. +diff -up hplip-3.15.11/fax/backend/hpfax.py.no-write-bytecode hplip-3.15.11/fax/backend/hpfax.py +--- hplip-3.15.11/fax/backend/hpfax.py.no-write-bytecode 2015-11-16 10:50:03.128459220 +0100 ++++ hplip-3.15.11/fax/backend/hpfax.py 2015-11-16 10:53:49.587937659 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python -B # -*- coding: utf-8 -*- # - # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. + # (c) Copyright 2003-2015 HP Development Company, L.P. diff --git a/hplip.spec b/hplip.spec index 5920c4c..d0f9997 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.15.9 -Release: 5%{?dist} +Version: 3.15.11 +Release: 1%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -227,8 +227,9 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \ --enable-hpijs-install \ --disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__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 +# FIXME: uncomment these once libhpdiscovery rpath problems are resolved ! +#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 @@ -266,6 +267,7 @@ rm -f %{buildroot}%{_bindir}/foomatic-rip \ %{buildroot}%{python3_sitearch}/*.la \ %{buildroot}%{_libdir}/libhpip.so \ %{buildroot}%{_libdir}/libhpipp.so \ + %{buildroot}%{_libdir}/libhpdiscovery.so \ %{buildroot}%{_libdir}/sane/*.la \ %{buildroot}%{_datadir}/cups/model/foomatic-ppds \ %{buildroot}%{_datadir}/applications/hplip.desktop \ @@ -418,6 +420,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %files libs %{_libdir}/libhpip.so.* %{_libdir}/libhpipp.so.* +%{_libdir}/libhpdiscovery.so.* # The so symlink is required here (see bug #489059). %{_libdir}/libhpmud.so* # Python extension @@ -450,6 +453,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Mon Nov 16 2015 Jiri Popelka - 3.15.11-1 +- 3.15.11 + * Tue Nov 10 2015 Fedora Release Engineering - 3.15.9-5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index 131159c..a2c0b7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8188653d1e65ae1c4850da78319007ee hplip-3.15.9.tar.gz +a2d8134ab15a1d67d4c3b3c11f85ba1c hplip-3.15.11.tar.gz