From 1c30332b29af4c5af466cd59a753d279b3b40055 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 4 Oct 2012 15:37:59 +0200 Subject: [PATCH] 3.12.10 --- .gitignore | 1 + hplip-3.12.10.tar.gz.asc | 7 +++++++ hplip-3.12.9.tar.gz.asc | 7 ------- hplip-cron-locale.patch | 12 ------------ hplip.spec | 11 +++++------ sources | 2 +- 6 files changed, 14 insertions(+), 26 deletions(-) create mode 100644 hplip-3.12.10.tar.gz.asc delete mode 100644 hplip-3.12.9.tar.gz.asc delete mode 100644 hplip-cron-locale.patch diff --git a/.gitignore b/.gitignore index e753a47..186d301 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ hplip-3.10.6.tar.gz /hplip-3.12.4.tar.gz /hplip-3.12.6.tar.gz /hplip-3.12.9.tar.gz +/hplip-3.12.10.tar.gz diff --git a/hplip-3.12.10.tar.gz.asc b/hplip-3.12.10.tar.gz.asc new file mode 100644 index 0000000..f11a63e --- /dev/null +++ b/hplip-3.12.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlBtIQAACgkQc9dwzaWQR7l/LwCfdOxVrvZrQmVhH2PtuzcqJxLm +5z0AoLrB7/6S++YsO73yAEZZcrSbjWx4 +=5Xz+ +-----END PGP SIGNATURE----- diff --git a/hplip-3.12.9.tar.gz.asc b/hplip-3.12.9.tar.gz.asc deleted file mode 100644 index 50e9400..0000000 --- a/hplip-3.12.9.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlBF9lcACgkQc9dwzaWQR7l6bACgwhUMGbH/uitt9s62sYGpiq4A -bGkAoMJcec/MsWx+lKsVr4NsuBxa/uwn -=QoO5 ------END PGP SIGNATURE----- diff --git a/hplip-cron-locale.patch b/hplip-cron-locale.patch deleted file mode 100644 index 804750e..0000000 --- a/hplip-cron-locale.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur hplip-3.12.9_old/data/rules/hplip_cron hplip-3.12.9/data/rules/hplip_cron ---- hplip-3.12.9_old/data/rules/hplip_cron 2012-09-22 15:29:11.026025004 +0200 -+++ hplip-3.12.9/data/rules/hplip_cron 2012-09-22 15:29:56.113580760 +0200 -@@ -1,5 +1,8 @@ - #!/bin/sh - -+LC_ALL=C -+LANG=C -+ - LOG_DIR=/var/log/hp/tmp - - # Default for number of days to keep old log files in /var/log/hp/tmp diff --git a/hplip.spec b/hplip.spec index 2cca694..605b1f3 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.12.9 -Release: 6%{?dist} +Version: 3.12.10 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -39,7 +39,6 @@ Patch28: hplip-wifisetup.patch Patch29: hplip-makefile-chgrp.patch Patch30: hplip-hpaio-localonly.patch Patch31: hplip-IEEE-1284-4.patch -Patch32: hplip-cron-locale.patch Requires(pre): /sbin/service Requires(post): /sbin/chkconfig @@ -292,9 +291,6 @@ done # Support IEEE 1284.4 protocol over USB (bug #858861). %patch31 -p1 -b .hplip-IEEE-1284-4 -# hplip_cron only works with english locale (Launchpad #1054584) -%patch32 -p1 -b .hplip-cron-locale.patch - sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -524,6 +520,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Thu Oct 04 2012 Jiri Popelka 3.12.10-1 +- 3.12.10 + * Tue Oct 02 2012 Jiri Popelka 3.12.9-6 - Ship %%{_localstatedir}/log/hp/tmp directory (bug #859658) diff --git a/sources b/sources index 0f9ed8e..d9383eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -843a089fb4f113e6a65312094aeab8aa hplip-3.12.9.tar.gz +38136d7f005dd222cb35134ec586dc8b hplip-3.12.10.tar.gz