Merge branch 'f18'

.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

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-----

hplip-3.12.9.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlBF9lcACgkQc9dwzaWQR7l6bACgwhUMGbH/uitt9s62sYGpiq4A
-bGkAoMJcec/MsWx+lKsVr4NsuBxa/uwn
-=QoO5
------END PGP SIGNATURE-----

hplip-cron-locale.patch

@@ -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

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.12.9
+Version: 3.12.10
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 
@@ -40,7 +40,6 @@ Patch29: hplip-makefile-chgrp.patch
 Patch30: hplip-hpaio-localonly.patch
 Patch31: hplip-ipp-accessors.patch
 Patch32: hplip-IEEE-1284-4.patch
-Patch33: hplip-cron-locale.patch
 
 Requires(pre): /sbin/service
 Requires(post): /sbin/chkconfig
@@ -296,9 +295,6 @@ done
 # Support IEEE 1284.4 protocol over USB (bug #858861).
 %patch32 -p1 -b .hplip-IEEE-1284-4
 
-# hplip_cron only works with english locale (Launchpad #1054584)
-%patch33 -p1 -b .hplip-cron-locale.patch
-
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -528,6 +524,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 04 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.10-1
+- 3.12.10
+
 * Tue Oct 02 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-6
 - Ship %%{_localstatedir}/log/hp/tmp directory (bug #859658)
 

sources

@@ -1 +1 @@
-843a089fb4f113e6a65312094aeab8aa  hplip-3.12.9.tar.gz
+38136d7f005dd222cb35134ec586dc8b  hplip-3.12.10.tar.gz