[splix: 3/3] Merge branch 'f18'

[Tim Waugh]

commit d752412cb17cdf9a6f447a24cbbfb4b20cb2bfda
Merge: 232fb80 868abc1
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Mar 5 12:15:04 2013 +0000

    Merge branch 'f18'

 splix.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc splix.spec
index d16e134,8dac704..21fab25
--- a/splix.spec
+++ b/splix.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
  Name: splix
  Version: 2.0.1
--Release: 0.14.%{checkout}%{?dist}
++Release: 0.15.%{checkout}%{?dist}
  License: GPLv2
  Group: System Environment/Base
  URL: http://splix.sourceforge.net/
@@@ -63,9 -63,9 +63,12 @@@ make install DRV_ONLY=1 CUPSDRV=%{_data
  %{_datadir}/cups/drv/splix
  
  %changelog
 -* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.14.20121128svn
++* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.15.20121128svn
+ - Build requires cups for postscriptdriver tags (bug #917333).
+ 
 +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.14.20121128svn
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.13.20121128svn
  - latest svn snapshot