Merge branch 'f17' into f18

This commit is contained in:
Jiri Popelka 2012-10-01 16:10:42 +02:00
commit 7e3be4e57b

View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.12.9
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
@ -524,6 +524,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Mon Oct 01 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-5
- release bump
* Thu Sep 27 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-4
- remove useless Conflicts:, Obsoletes: and Provides: fields
- remove %%pre section (stopping&disabling of hplip service on upgrade)