[hplip/f15] 3.12.4
Jiří Popelka
jpopelka at fedoraproject.org
Thu Apr 12 12:41:07 UTC 2012
commit bf2cb338cf62864228d52dc2591bf0ad3aa595d4
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Thu Apr 12 14:28:27 2012 +0200
3.12.4
.gitignore | 1 +
hplip-3.12.2.tar.gz.asc | 7 -------
hplip-3.12.4.tar.gz.asc | 7 +++++++
hplip-deviceIDs-drv.patch | 9 ---------
hplip-udev-rules.patch | 16 ++++++++--------
hplip.spec | 20 ++++++++++++++++----
sources | 2 +-
7 files changed, 33 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 012fed3..8f72616 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ hplip-3.10.6.tar.gz
/hplip-3.11.10.tar.gz
/hplip-3.11.12.tar.gz
/hplip-3.12.2.tar.gz
+/hplip-3.12.4.tar.gz
diff --git a/hplip-3.12.4.tar.gz.asc b/hplip-3.12.4.tar.gz.asc
new file mode 100644
index 0000000..7f6d0b0
--- /dev/null
+++ b/hplip-3.12.4.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAk+D8jEACgkQc9dwzaWQR7lIrgCgyhirUKUz1u/lF5bkkxBj6spG
+yAEAoMK7jiMHuSt9tuQ45Hmi2USWAS6r
+=Mj+M
+-----END PGP SIGNATURE-----
diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index 14543ee..d1dc53a 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -1298,15 +1298,6 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-deskjet_600.ppd"
Attribute "Product" "" "(HP Deskjet 600c Printer)"
Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -13632,7 +13635,7 @@ Group "RLT/HP Real Life Technologies"
- ModelName "HP Officejet Series 500"
- Attribute "NickName" "" "HP Officejet Series 500, $Version"
- Attribute "ShortNickName" "" "HP Officejet Series 500"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 500;DES:officejet series 500;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 500;DES:officejet series 500;"
- PCFileName "hp-officejet_series_500.ppd"
- Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)"
- }
@@ -13672,7 +13675,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet Series 600"
Attribute "NickName" "" "HP Officejet Series 600, $Version"
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index f13189b..46fd00a 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.12/data/rules/56-hpmud_support.rules
---- hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules 2011-12-09 12:19:54.000000000 +0100
-+++ hplip-3.11.12/data/rules/56-hpmud_support.rules 2011-12-19 17:23:29.769128810 +0100
+diff -up hplip-3.12.4/data/rules/56-hpmud_support.rules.udev-rules hplip-3.12.4/data/rules/56-hpmud_support.rules
+--- hplip-3.12.4/data/rules/56-hpmud_support.rules.udev-rules 2012-04-10 10:34:19.000000000 +0200
++++ hplip-3.12.4/data/rules/56-hpmud_support.rules 2012-04-12 12:31:05.120241342 +0200
@@ -6,6 +6,7 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
LABEL="pid_test"
@@ -9,10 +9,10 @@ diff -up hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.1
# Check for LaserJet products (0x03f0xx17).
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
# Check for LaserJet products (0x03f0xx2a).
-diff -up hplip-3.11.12/Makefile.in.udev-rules hplip-3.11.12/Makefile.in
---- hplip-3.11.12/Makefile.in.udev-rules 2011-12-09 12:23:55.000000000 +0100
-+++ hplip-3.11.12/Makefile.in 2011-12-19 17:24:14.204573291 +0100
-@@ -4106,7 +4106,7 @@ cups_drv = prnt/drv/hpcups.drv
+diff -up hplip-3.12.4/Makefile.in.udev-rules hplip-3.12.4/Makefile.in
+--- hplip-3.12.4/Makefile.in.udev-rules 2012-04-10 10:38:51.000000000 +0200
++++ hplip-3.12.4/Makefile.in 2012-04-12 12:36:40.806539034 +0200
+@@ -4119,7 +4119,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE at hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
# hpmud.rules
@@ -20,4 +20,4 @@ diff -up hplip-3.11.12/Makefile.in.udev-rules hplip-3.11.12/Makefile.in
+ at HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d
@HPLIP_BUILD_TRUE at dist_rules_DATA = data/rules/56-hpmud_support.rules \
@HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \
- @HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)
+ @HPLIP_BUILD_TRUE@ data/rules/56-hpmud_add_printer.rules \
diff --git a/hplip.spec b/hplip.spec
index 7a770ac..cf179f1 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.12.2
-Release: 4%{?dist}
+Version: 3.12.4
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -56,6 +56,7 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: python-imaging
Requires: cups
Requires: wget
+Requires: dbus-python
BuildRequires: net-snmp-devel
BuildRequires: cups-devel
@@ -364,6 +365,12 @@ find doc/images -type f -exec chmod 644 {} \;
rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
rm -f %{buildroot}%{_datadir}/hplip/hplip-install
rm -rf %{buildroot}%{_datadir}/hplip/install.*
+rm -f %{buildroot}%{_datadir}/hplip/uninstall.*
+rm -f %{buildroot}%{_bindir}/hp-uninstall
+rm -f %{buildroot}%{_datadir}/hplip/upgrade.*
+rm -f %{buildroot}%{_bindir}/hp-upgrade
+rm -f %{buildroot}%{_bindir}/hp-config_usb_printer
+rm -f %{buildroot}%{_datadir}/hplip/config_usb_printer.*
rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types
rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff*
@@ -381,6 +388,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_bindir}/hp-colorcal
%{_bindir}/hp-devicesettings
%{_bindir}/hp-diagnose_plugin
+%{_bindir}/hp-diagnose_queues
%{_bindir}/hp-fab
%{_bindir}/hp-faxsetup
%{_bindir}/hp-firmware
@@ -409,11 +417,12 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/cups/mime/pstotiff.convs
# Files
%{_datadir}/hplip/align.py*
-%{_datadir}/hplip/check-plugin*
+%{_datadir}/hplip/check-plugin.py*
%{_datadir}/hplip/clean.py*
%{_datadir}/hplip/colorcal.py*
%{_datadir}/hplip/devicesettings.py*
-%{_datadir}/hplip/diagnose_plugin*
+%{_datadir}/hplip/diagnose_plugin.py*
+%{_datadir}/hplip/diagnose_queues.py*
%{_datadir}/hplip/fab.py*
%{_datadir}/hplip/fax
%{_datadir}/hplip/faxsetup.py*
@@ -519,6 +528,9 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
+* Thu Apr 12 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.4-1
+- 3.12.4
+
* Wed Mar 21 2012 Tim Waugh <twaugh at redhat.com> 3.12.2-4
- Release parport if unsupported model connected (bug #699052).
diff --git a/sources b/sources
index eabbf03..ab92773 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6572ec99c1818cc92d97b793bff08633 hplip-3.12.2.tar.gz
+a063f76aa47edab55a3f31ff2558df07 hplip-3.12.4.tar.gz
More information about the scm-commits
mailing list