[splix/f17] Latest upstream snapshot: all patches and changes merged upstream !

[Jiří Popelka]

commit f0889b8d90306ac5f6a1f9addba066c0e0c44229
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Apr 19 13:15:07 2012 +0200

    Latest upstream snapshot: all patches and changes merged upstream !

 .gitignore                 |    1 +
 sources                    |    2 +-
 splix-custom-ppd-dir.patch |   12 ---
 splix-drv.patch            |  211 --------------------------------------------
 splix-nostrip.patch        |   15 ---
 splix.spec                 |   28 ++-----
 6 files changed, 9 insertions(+), 260 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32d5353..94f1f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /splix-2.0.1.20111121svn.tar.gz
+/splix-2.0.1.20120419svn.tar.gz
diff --git a/sources b/sources
index 6e0191e..12f1c3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e3abdecc072656d139a68156e500910  splix-2.0.1.20111121svn.tar.gz
+cad40fe27e21d9b7b0c2a4d88b7f3b47  splix-2.0.1.20120419svn.tar.gz
diff --git a/splix.spec b/splix.spec
index 049b161..60db68e 100644
--- a/splix.spec
+++ b/splix.spec
@@ -1,9 +1,9 @@
-%global checkout 20111121svn
+%global checkout 20120419svn
 
 Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
 Name: splix
 Version: 2.0.1
-Release: 0.8.%{checkout}%{?dist}
+Release: 0.9.%{checkout}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://splix.sourceforge.net/
@@ -13,18 +13,9 @@ URL: http://splix.sourceforge.net/
 # and renamed to follow naming guidelines
 Source0: splix-%{version}.%{checkout}.tar.gz
 
-# Don't strip symbols out of the binaries so the debuginfo can be created
-Patch0:  splix-nostrip.patch
-
 # Add Device ID for
 # Samsung ML-1610
-Patch1:  splix-deviceID.patch
-
-# Install PPDs to custom directory
-Patch2:  splix-custom-ppd-dir.patch
-
-# Don't install PPD files at all, only DRV files.
-Patch3:  splix-drv.patch
+Patch0:  splix-deviceID.patch
 
 Requires: cups
 
@@ -45,16 +36,8 @@ Splix doesn't support old SPL(1) printers.
 
 %prep
 %setup -q -n splix
-# some files have wrongly set executable bit
-chmod -x include/algo0x0d.h
-chmod -x include/algo0x0e.h
-chmod -x src/algo0x0e.cpp
-chmod -x ppd/po/pt.po
 
-%patch0 -p1 -b .nostrip
-%patch1 -p1 -b .deviceID
-%patch2 -p1 -b .custom-ppd-dir
-%patch3 -p1 -b .drv-only
+%patch0 -p1 -b .deviceID
 
 pushd ppd
 # rename *.drv to *.drv.in
@@ -102,6 +85,9 @@ make install
 %{_datadir}/cups/model/splix/
 
 %changelog
+* 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 !
+
 * Wed Jan 18 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.20111121svn
 - Add Device ID for Samsung ML-1660.