Merge branch 'f24' into f25

2016-09-22 14:45:01 +02:00 · 2016-09-22 14:45:01 +02:00 · 5a6ecf5f94
commit 5a6ecf5f94
parent d03831610e cf8ef93867
5 changed files with 14 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -77,3 +77,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.16.5.tar.gz
 /hplip-3.16.7.tar.gz
 /hplip-3.16.8.tar.gz
+/hplip-3.16.9.tar.gz
--- a/hplip-3.16.8.tar.gz.asc
+++ b/hplip-3.16.8.tar.gz.asc
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlfAFeQACgkQc9dwzaWQR7lP7gCgrcXWt3IcwXLNhyUUEZfBXKSP
-rFIAoJbUJlX6p8jmV8bKpMQEekUyWpwO
-=U4th
-----END PGP SIGNATURE-----
--- a/hplip-3.16.9.tar.gz.asc
+++ b/hplip-3.16.9.tar.gz.asc
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlff4uUACgkQc9dwzaWQR7kg/QCgzf3QnBOcs+MlWRo/IirTZ0zc
+nycAniVTICnUhX89IEEewMfVRtzTGNhD
+=JXXj
+-----END PGP SIGNATURE-----
--- a/hplip.spec
+++ b/hplip.spec
@ -6,8 +6,8 @@

 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.16.8
-Release: 2%{?dist}
+Version: 3.16.9
+Release: 1%{?dist}
 License: GPLv2+ and MIT and BSD

 Url: http://hplip.sourceforge.net/
@ -470,6 +470,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig

 %changelog
+* Thu Sep 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.9-1
+- rebase to 3.16.9 
+
 * Thu Sep 01 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.8-2
 - bad whitespaces (bug #1372343)

--- a/2
+++ b/2
@ -1 +1 @@
-3e62c8ce740a4b40e1bf9ab1440f3ad5  hplip-3.16.8.tar.gz
+c173ff4a0192645c55763ff3fe503264  hplip-3.16.9.tar.gz