3.15.4

.gitignore

@@ -67,3 +67,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.14.6.tar.gz
 /hplip-3.14.10.tar.gz
 /hplip-3.15.2.tar.gz
+/hplip-3.15.4.tar.gz

hplip-3.15.2.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlTKJoUACgkQc9dwzaWQR7nT8gCdEy8HVaJNSA5ajtXet7YAGs5H
-6NwAoLVDro3CLYkLqnwHIDTzR+leQgdM
-=qmEP
------END PGP SIGNATURE-----

hplip-3.15.4.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlUs5JkACgkQc9dwzaWQR7kX6QCfQrjES2UQSQNadZD7kT+SyeFr
+9woAoKJjGtKRmFF7tucUCxZN/uBmLsNe
+=RtGm
+-----END PGP SIGNATURE-----

hplip-reportlab.patch

@@ -1,129 +0,0 @@
-diff -up hplip-3.15.2/installer/core_install.py.reportlab hplip-3.15.2/installer/core_install.py
---- hplip-3.15.2/installer/core_install.py.reportlab	2015-01-29 13:20:24.000000000 +0100
-+++ hplip-3.15.2/installer/core_install.py	2015-03-12 10:25:59.597102071 +0100
-@@ -880,19 +880,19 @@ class CoreInstall(object):
-             log.debug("Trying to import 'reportlab'...")
-             import reportlab
- 
--            ver = reportlab.Version
--            try:
--                ver_f = float(ver)
--            except ValueError:
--                log.debug("Can't determine version.")
--                return False
-+            def xint(x):
-+                try:
-+                    return int(x)
-+                except:
-+                    return 0
-+
-+            ver = [xint(x) for x in reportlab.Version.split ('.')]
-+            log.debug("Version: %s" % ver)
-+            if ver >= [2, 0]:
-+                log.debug("Success.")
-+                return True
-             else:
--                log.debug("Version: %.1f" % ver_f)
--                if ver_f >= 2.0:
--                    log.debug("Success.")
--                    return True
--                else:
--                    return False
-+                return False
- 
-         except ImportError:
-             log.debug("Failed.")
-diff -up hplip-3.15.2/installer/dcheck.py.reportlab hplip-3.15.2/installer/dcheck.py
---- hplip-3.15.2/installer/dcheck.py.reportlab	2015-01-29 13:20:24.000000000 +0100
-+++ hplip-3.15.2/installer/dcheck.py	2015-03-12 10:29:56.334733611 +0100
-@@ -215,30 +215,32 @@ def check_lsmod(module):
- 
- def check_version(inst_ver_str, min_ver_str='0.0'):
-     log.debug("Checking: installed ver=%s  min ver=%s" % (inst_ver_str, min_ver_str))
--    min_ver = 0
-+
-+    def xint(x):
-+        try:
-+            return int(x)
-+        except ValueError:
-+            return 0
-+
-+    min_ver = [0]
-     if min_ver_str != '-':
-         match_obj=ver_pat.search(min_ver_str)
-         try:
-             ver = match_obj.group(1)
-         except AttributeError:
-             ver = ''
--        try:
--            min_ver = float(ver)
--        except ValueError:
--            min_ver = 0
- 
--    inst_ver = 0
-+        min_ver = [xint(x) for x in ver.split ('.')]
-+
-+    inst_ver = [0]
-     if inst_ver_str != '-':
-         match_obj=ver_pat.search(inst_ver_str)
-         try:
-             ver = match_obj.group(1)
-         except AttributeError:
-             ver = ''
--        try:
--            inst_ver = float(ver)
--        except ValueError:
--            inst_ver = 0
- 
-+        inst_ver = [xint(x) for x in ver.split ('.')]
- 
-     if inst_ver < min_ver:
-         log.debug("Found, but newer version required.")
-diff -up hplip-3.15.2/ui4/sendfaxdialog.py.reportlab hplip-3.15.2/ui4/sendfaxdialog.py
---- hplip-3.15.2/ui4/sendfaxdialog.py.reportlab	2015-01-29 13:20:15.000000000 +0100
-+++ hplip-3.15.2/ui4/sendfaxdialog.py	2015-03-12 10:25:59.598102056 +0100
-@@ -75,13 +75,14 @@ coverpages_enabled = False
- if fax_enabled:
-     try:
-         import reportlab
--        ver = reportlab.Version
--        try:
--            ver_f = float(ver)
--        except ValueError:
--            ver_f = 0.0
-+        def xint(x):
-+            try:
-+                return int(x)
-+            except:
-+                return 0
- 
--        if ver_f >= 2.0:
-+        ver = [xint(x) for x in reportlab.Version.split('.')]
-+        if ver >= [2, 0]:
-             coverpages_enabled = True
-         else:
-             log.warn("Pre-2.0 version of Reportlab installed. Fax coverpages disabled.")
-diff -up hplip-3.15.2/ui/scrollfax.py.reportlab hplip-3.15.2/ui/scrollfax.py
---- hplip-3.15.2/ui/scrollfax.py.reportlab	2015-01-29 13:20:22.000000000 +0100
-+++ hplip-3.15.2/ui/scrollfax.py	2015-03-12 10:25:59.599102042 +0100
-@@ -54,13 +54,14 @@ coverpages_enabled = False
- if fax_enabled:
-     try:
-         import reportlab
--        ver = reportlab.Version
--        try:
--            ver_f = float(ver)
--        except ValueError:
--            ver_f = 0.0
-+        def xint(x):
-+            try:
-+                return int(x)
-+            except:
-+                return 0
- 
--        if ver_f >= 2.0:
-+        ver = [xint(x) for x in reportlab.Version.split('.')]
-+        if ver >= [2, 0]:
-             coverpages_enabled = True
-         else:
-             log.warn("Pre-2.0 version of Reportlab installed. Fax coverpages disabled.")

hplip.spec

@@ -9,8 +9,8 @@
 
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.15.2
+Version: 3.15.4
-Release: 9%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 
 Url: http://hplip.sourceforge.net/
@@ -35,7 +35,6 @@ Patch15: hplip-ppd-ImageableArea.patch
 Patch16: hplip-scan-tmp.patch
 Patch17: hplip-log-stderr.patch
 Patch18: hplip-avahi-parsing.patch
-Patch19: hplip-reportlab.patch
 Patch20: hplip-dj990c-margin.patch
 Patch21: hplip-strncpy.patch
 Patch22: hplip-no-write-bytecode.patch
@@ -226,10 +225,6 @@ done
 # Fix parsing of avahi-daemon output (bug #1096939).
 %patch18 -p1 -b .parsing
 
-# Fixed version comparisons for x.y.z-style versions such as
-# reportlab (bug #1121433).
-%patch19 -p1 -b .reportlab
-
 # Fixed left/right margins for HP DeskJet 990C (LP #1405212).
 %patch20 -p1 -b .dj990c-margin
 
@@ -264,7 +259,7 @@ pushd ../%{py2dir}
 %configure PYTHON=%{__python2}
 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 libhpmud.la hpmudext.la cupsext.la
+make libhpmud.la hpmudext.la libhpipp.la cupsext.la pcardext.la scanext.la
 popd
 
 %configure \
@@ -286,6 +281,8 @@ pushd ../%{py2dir}
 make install-libLTLIBRARIES \
      install-hpmudextLTLIBRARIES \
      install-cupsextLTLIBRARIES \
+     install-pcardextLTLIBRARIES \
+     install-scanextLTLIBRARIES \
      DESTDIR=%{buildroot} PYTHON=%{__python2}
 rm -f %{buildroot}%{python2_sitearch}/*.la
 popd
@@ -323,6 +320,7 @@ rm -f   %{buildroot}%{_bindir}/foomatic-rip \
         %{buildroot}%{_libdir}/*.la \
         %{buildroot}%{python3_sitearch}/*.la \
         %{buildroot}%{_libdir}/libhpip.so \
+        %{buildroot}%{_libdir}/libhpipp.so \
         %{buildroot}%{_libdir}/sane/*.la \
         %{buildroot}%{_datadir}/cups/model/foomatic-ppds \
         %{buildroot}%{_datadir}/applications/hplip.desktop \
@@ -480,6 +478,7 @@ rm -f ppds-all
 
 %files libs
 %{_libdir}/libhpip.so.*
+%{_libdir}/libhpipp.so.*
 # The so symlink is required here (see bug #489059).
 %{_libdir}/libhpmud.so*
 # Python extension
@@ -524,6 +523,9 @@ rm -f ppds-all
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Apr 16 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.4-1
+- 3.15.4
+
 * Mon Mar 23 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.2-9
 - Build and ship also Python 2 modules for hp-plugin (bug #1196237).
 

sources

@@ -1 +1 @@
-bbc55fc0d45e130a24ab042f60f9f888  hplip-3.15.2.tar.gz
+2cc12f3c8c2cf023891980c8a6b3fa5d  hplip-3.15.4.tar.gz