[hplip: 1/3] 3.12.9
Jiří Popelka
jpopelka at fedoraproject.org
Fri Sep 7 13:59:19 UTC 2012
commit b906ef154d4692074d29faee2f46b01229528a53
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Fri Sep 7 15:48:12 2012 +0200
3.12.9
.gitignore | 1 +
hplip-3.12.6.tar.gz.asc | 7 -------
hplip-3.12.9.tar.gz.asc | 7 +++++++
hplip-addprinter.patch | 22 +++++++++++-----------
hplip-deviceIDs-drv.patch | 9 ---------
hplip-fax-ppd.patch | 24 ------------------------
hplip-makefile-chgrp.patch | 20 +++++++++++++++-----
hplip-udev-rules.patch | 2 +-
hplip.spec | 19 ++++++++++++-------
sources | 2 +-
10 files changed, 48 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3c03301..e753a47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ hplip-3.10.6.tar.gz
/hplip-3.12.2.tar.gz
/hplip-3.12.4.tar.gz
/hplip-3.12.6.tar.gz
+/hplip-3.12.9.tar.gz
diff --git a/hplip-3.12.9.tar.gz.asc b/hplip-3.12.9.tar.gz.asc
new file mode 100644
index 0000000..50e9400
--- /dev/null
+++ b/hplip-3.12.9.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlBF9lcACgkQc9dwzaWQR7l6bACgwhUMGbH/uitt9s62sYGpiq4A
+bGkAoMJcec/MsWx+lKsVr4NsuBxa/uwn
+=QoO5
+-----END PGP SIGNATURE-----
diff --git a/hplip-addprinter.patch b/hplip-addprinter.patch
index df8d34f..bcbb39e 100644
--- a/hplip-addprinter.patch
+++ b/hplip-addprinter.patch
@@ -1,11 +1,11 @@
-diff -up hplip-3.11.1/prnt/cupsext/cupsext.c.addprinter hplip-3.11.1/prnt/cupsext/cupsext.c
---- hplip-3.11.1/prnt/cupsext/cupsext.c.addprinter 2011-01-19 06:15:27.000000000 +0100
-+++ hplip-3.11.1/prnt/cupsext/cupsext.c 2011-01-24 12:24:01.000000000 +0100
-@@ -510,6 +510,7 @@ PyObject * addPrinter( PyObject * self,
- strcpy( info, name );
-
- /* Connect to the HTTP server */
-+ cupsSetUser ("root");
- if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
- {
- r = 0;
+diff -up hplip-3.12.9/prnt/cupsext/cupsext.c.addprinter hplip-3.12.9/prnt/cupsext/cupsext.c
+--- hplip-3.12.9/prnt/cupsext/cupsext.c.addprinter 2012-09-04 14:31:10.000000000 +0200
++++ hplip-3.12.9/prnt/cupsext/cupsext.c 2012-09-07 14:20:24.626193617 +0200
+@@ -511,6 +511,7 @@ PyObject * addPrinter( PyObject * self,
+ strcpy( info, name );
+
+ /* Connect to the HTTP server */
++ cupsSetUser ("root");
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ r = 0;
diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index d1dc53a..8e8ba88 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -621,15 +621,6 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)"
}
-@@ -11050,7 +11051,7 @@ Group "RLT/HP Real Life Technologies"
- ModelName "HP LaserJet m1536dnf MFP"
- Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version"
- Attribute "ShortNickName" "" "HP LaserJet m1536dnf MFP"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1536dnf mfp;DES:hp laserjet m1536dnf mfp;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1536dnf mfp;DES:hp laserjet m1536dnf mfp;"
- PCFileName "hp-laserjet_m1536dnf_mfp-pcl3.ppd"
- Attribute "Product" "" "(HP LaserJet m1536dnf MFP)"
- }
@@ -11122,7 +11123,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet p2015 Series"
Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version"
diff --git a/hplip-makefile-chgrp.patch b/hplip-makefile-chgrp.patch
index a480050..0ddfb2a 100644
--- a/hplip-makefile-chgrp.patch
+++ b/hplip-makefile-chgrp.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.11.12/Makefile.in.chgrp hplip-3.11.12/Makefile.in
---- hplip-3.11.12/Makefile.in.chgrp 2011-12-09 12:23:55.000000000 +0100
-+++ hplip-3.11.12/Makefile.in 2011-12-19 15:16:53.907090155 +0100
-@@ -8582,10 +8582,10 @@ uninstall-am: uninstall-binPROGRAMS unin
+diff -up hplip-3.12.9/Makefile.in.chgrp hplip-3.12.9/Makefile.in
+--- hplip-3.12.9/Makefile.in.chgrp 2012-09-07 14:35:14.334691556 +0200
++++ hplip-3.12.9/Makefile.in 2012-09-07 14:36:02.974988844 +0200
+@@ -8841,18 +8841,18 @@ uninstall-am: uninstall-binPROGRAMS unin
install-dist_hplip_LogDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
@@ -13,4 +13,14 @@ diff -up hplip-3.11.12/Makefile.in.chgrp hplip-3.11.12/Makefile.in
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
- install-data-hook:
+ install-dist_hplip_tmpDATA:
+ @FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+- at FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+ @FULL_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+ @HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+- at HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+ @HPLIP_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+
+ install-dist_cronDATA:$(dist_cron_DATA)
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index 008bfa0..d7e72cd 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -13,7 +13,7 @@ diff -up hplip-3.12.6/Makefile.in.udev-rules hplip-3.12.6/Makefile.in
--- hplip-3.12.6/Makefile.in.udev-rules 2012-06-18 12:44:46.000000000 +0200
+++ hplip-3.12.6/Makefile.in 2012-06-19 10:57:37.812828378 +0200
@@ -4274,7 +4274,7 @@ cups_drv = prnt/drv/hpcups.drv
- @HPLIP_BUILD_TRUE at hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+ @HPLIP_BUILD_TRUE at dist_cron_DATA = data/rules/hplip_cron
# hpmud.rules
- at HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
diff --git a/hplip.spec b/hplip.spec
index 71047b0..050d11a 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,6 +1,6 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.12.6
+Version: 3.12.9
Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
@@ -28,7 +28,6 @@ Patch11: hplip-hpijs-marker-supply.patch
Patch12: hplip-clear-old-state-reasons.patch
Patch13: hplip-systray-dbus-exception.patch
Patch14: hplip-hpcups-sigpipe.patch
-Patch15: hplip-fax-ppd.patch
Patch16: hplip-bad-low-ink-warning.patch
Patch17: hplip-deviceIDs-ppd.patch
Patch18: hplip-skip-blank-lines.patch
@@ -50,13 +49,15 @@ Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig
-%define hpijs_epoch 1
+%global hpijs_epoch 1
Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: python-imaging
Requires: cups
Requires: wget
Requires: dbus-python
+# for /etc/cron.daily/hplip_cron
+Requires: crontabs
BuildRequires: net-snmp-devel
BuildRequires: cups-devel
@@ -213,9 +214,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
# Avoid busy loop in hpcups when backend has exited (bug #525944).
%patch14 -p1 -b .hpcups-sigpipe
-# Use correct fax PPD name for Qt3 UI.
-%patch15 -p1 -b .fax-ppd
-
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
%patch16 -p1 -b .bad-low-ink-warning
@@ -288,7 +286,7 @@ done
# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
%patch28 -p1 -b .wifisetup
-# Don't run 'chgrp lp /var/log/hp' in makefile
+# Don't run 'chgrp lp /var/log/hp' and 'chgrp lp /var/log/hp/tmp' in makefile
%patch29 -p1 -b .chgrp
# Pay attention to the SANE localOnly flag in hpaio (bug #743593).
@@ -395,6 +393,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_bindir}/hp-info
%{_bindir}/hp-levels
%{_bindir}/hp-linefeedcal
+%{_bindir}/hp-logcapture
%{_bindir}/hp-makecopies
%{_bindir}/hp-makeuri
%{_bindir}/hp-mkuri
@@ -433,6 +432,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/hplip/__init__.py*
%{_datadir}/hplip/levels.py*
%{_datadir}/hplip/linefeedcal.py*
+%{_datadir}/hplip/logcapture.py*
%{_datadir}/hplip/makecopies.py*
%{_datadir}/hplip/makeuri.py*
%{_datadir}/hplip/plugin.py*
@@ -461,6 +461,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/hplip/scan
%{_localstatedir}/lib/hp
%dir %attr(0774,root,lp) %{_localstatedir}/log/hp
+%{_sysconfdir}/cron.daily/hplip_cron
%files common
%doc COPYING
@@ -528,6 +529,10 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
+* Fri Sep 07 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-1
+- 3.12.9
+-- no longer needed: fax-ppd.patch
+
* Tue Jun 19 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.6-1
- 3.12.6
diff --git a/sources b/sources
index 4fe1736..0f9ed8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5303938e8630775ea6fb383af85775e5 hplip-3.12.6.tar.gz
+843a089fb4f113e6a65312094aeab8aa hplip-3.12.9.tar.gz
More information about the scm-commits
mailing list