Accepting request 59767 from Printing

Accepted submit request 59767 from user jsmeix

OBS-URL: https://build.opensuse.org/request/show/59767
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=58

change-udev-rules.diff

@@ -1,6 +1,6 @@
---- data/rules/55-hpmud.rules.orig	2010-09-26 19:06:17.000000000 +0200
-+++ data/rules/55-hpmud.rules	2010-10-27 16:19:36.000000000 +0200
-@@ -12,140 +12,183 @@
+--- data/rules/55-hpmud.rules.orig	2011-01-19 06:17:26.000000000 +0100
++++ data/rules/55-hpmud.rules	2011-02-01 16:03:52.000000000 +0100
+@@ -12,142 +12,185 @@
  #   3. This rules file is an attempt at being compatable with all distros. Feel free to make your own changes and if you feel your
  #      changes are not distro specific please send your patch to us. 2/11/2009, D Suffield
  #
@@ -225,6 +225,9 @@
  # Check for LaserJet products (0x03f0xx2a).
 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
 +ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
+ # Check for DesignJet product (0x03f0xx14).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
  
  # Removed the following rule because FHS states that /etc should be reserved for static files only. This
  # functionality should be done in a deb/rpm post install script.  2/11/2009, D Suffield
@@ -245,8 +248,8 @@
  
  LABEL="hpmud_rules_end"
 +
---- data/rules/56-hpmud_support.rules.orig	2010-09-26 19:06:17.000000000 +0200
-+++ data/rules/56-hpmud_support.rules	2010-10-27 16:22:48.000000000 +0200
+--- data/rules/56-hpmud_support.rules.orig	2011-01-19 06:17:26.000000000 +0100
++++ data/rules/56-hpmud_support.rules	2011-02-01 16:06:47.000000000 +0100
 @@ -1,15 +1,17 @@
  # HPLIP udev rules file. Notify console user if plugin support is required for this device.
  

hplip-3.10.9.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:985520e4738b6064707d5bc914f7a570b8efd66d5160754bc61cdd76bfd442c1
-size 19886788

hplip-3.11.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d64ba3e30d3a415c050f8fad9c7e6706d12cdf2d40d596e6e18515d8c7e07977
+size 20173561

hplip.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Feb  1 16:19:21 CET 2011 - jsmeix@suse.de
+
+- Updated to version 3.11.1:
+  New encapsulation format for LJZJStream class.
+  Alignment of cartridges over LEDM (Low End Data Model).
+  LEDM dynamic scan resolution.
+  New fax protocol (Low End Data Model) support.
+  ADF and color scan for some HP LaserJet Pro and MFP devices.
+  Some more supported all-in-one devices.
+  Many bug fixies (no Suse bugs).
+  For details see
+  http://hplipopensource.com/hplip-web/release_notes.html
+- Adapted change-udev-rules.diff for version 3.11.1
+  because the "DesignJet product (0x03f0xx14)" was added.
+
 -------------------------------------------------------------------
 Thu Jan 13 16:29:01 CET 2011 - jsmeix@suse.de
 

hplip.spec

@@ -29,13 +29,13 @@ Summary:        HP's Printing, Scanning, and Faxing Software
 # HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
 # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
 # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
-Version:        3.10.9
+Version:        3.11.1
 Release:        4
 Group:          Hardware/Printing
 License:        BSD3c(or similar) ; GPLv2+ ; MIT License (or similar)
 Url:            http://hplipopensource.com
 # Source0...Source9 is for sources from HP:
-# URL for Source0: http://downloads.sourceforge.net/project/hplip/hplip/3.10.9/hplip-3.10.9.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fhplip%2Ffiles%2Fhplip%2F3.10.9%2Fhplip-3.10.9.tar.gz%2Fdownload%3Fuse_mirror%3Dpuzzle&ts=1288186183&use_mirror=mesh
+# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.11.1.tar.gz
 Source0:        %{name}-%{version}.tar.bz2
 # Patch0...Patch9 is for patches from HP:
 # Patch10...Patch99 is for Suse patches for the sources from HP:
@@ -203,13 +203,14 @@ Enhances:       ghostscript_any
 # installed from the openSUSE CDs but on our official online repository
 # only hplip-1.2.3-6.7 is available which should usually also work):
 Suggests:       hplip = %{version}
+# hpijs-standalone was a stand-alone minimalist package
+# which is no longer provided since a long time.
 # hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs
-# so that both packages have a RPM conflict.
-# But when the minimalist hpijs-standalone is to be replaced
-# by the full-featured hplip, hplip requires hplip-hpijs
-# and this should silently supersede hpijs-standalone:
-Obsoletes:      hpijs-standalone <= %{version}
-Provides:       hpijs-standalone = %{version}
+# so that both packages have a RPM conflict which should
+# be solved by a silent replacement of the old hpijs-standalone.
+# This Obsoletes is intentionally unversioned because
+# hplip-hpijs should replace any version of hpijs-standalone.
+Obsoletes:      hpijs-standalone
 # Either the hplip17 packages or the hplip packages can be installed,
 # see https://bugzilla.novell.com/show_bug.cgi?id=251830#c20
 # for the full story why there is this unversioned Obsoletes:
@@ -404,7 +405,7 @@ done
 # than to be rigorous regarding enforcing compliance to the PPD specification:
 echo "Final testing by cupstestppd..."
 for p in *.ppd
-do egrep -v '^\*UIConstraints:|^\*NonUIConstraints:|^\*cupsFilter:' $p | cupstestppd - || true
+do grep -E -v '^\*UIConstraints:|^\*NonUIConstraints:|^\*cupsFilter:' $p | cupstestppd - || true
    gzip $p
 done
 echo "End of general tests and adjustments for all PPDs."