[splix/f18: 2/2] Merge branch 'f17' into f18

[Tim Waugh]

commit 868abc1a63795e4dedd9f0eb1fa10ab53f0b044c
Merge: 7e7d5d9 7561f7e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Mar 5 12:11:31 2013 +0000

    Merge branch 'f17' into f18

 splix.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc splix.spec
index 27b8e88,b9942de..8dac704
--- 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.13.%{checkout}%{?dist}
 -Release: 0.12.%{checkout}%{?dist}
++Release: 0.14.%{checkout}%{?dist}
  License: GPLv2
  Group: System Environment/Base
  URL: http://splix.sourceforge.net/
@@@ -63,19 -63,19 +63,22 @@@ 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.12.20121128svn
++* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.14.20121128svn
+ - Build requires cups for postscriptdriver tags (bug #917333).
+ 
 -* Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.11.20121128svn
 +* Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.13.20121128svn
  - latest svn snapshot
  
 -* Wed Oct 17 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.10.20120419svn
 +* Wed Oct 17 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.12.20120419svn
  - Add Device ID for Xerox Phaser 3124 (#867392).
  
 -* Tue Sep 25 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
 +* Tue Sep 25 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.11.20120419svn
  - Add Device ID for Samsung ML-2525 (#859669).
  
 -* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.20120419svn
 +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.10.20120419svn
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
 +* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
  - Latest upstream snapshot: all patches and changes merged upstream !
  - Build splix with JBIG1 support and install DRV files instead of PPD files.
  - Add Device ID for Samsung ML-2010 (#807308).