[splix] Latest upstream snapshot.

[Jiří Popelka]

commit 6a3348aa975326ea0dd2648cdb87861189b71512
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Sep 2 14:16:30 2013 +0200

    Latest upstream snapshot.

 .gitignore           |    1 +
 sources              |    2 +-
 splix-deviceID.patch |   15 +++++++--------
 splix.spec           |   21 ++++++++++++---------
 4 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8482440..80e2c95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /splix-2.0.1.20111121svn.tar.gz
 /splix-2.0.1.20120419svn.tar.gz
 /splix-2.0.1.20121128svn.tar.gz
+/splix-2.0.1.20130902svn.tar.bz2
diff --git a/sources b/sources
index 210441b..9f54263 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc763d24f5d1bcdf5d8a633cd51f4b6b  splix-2.0.1.20121128svn.tar.gz
+2901e9482dd1a7c44f7b730696868e09  splix-2.0.1.20130902svn.tar.bz2
diff --git a/splix-deviceID.patch b/splix-deviceID.patch
index 57e86fe..7482247 100644
--- a/splix-deviceID.patch
+++ b/splix-deviceID.patch
@@ -1,6 +1,6 @@
 diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
---- splix/ppd/samsung.drv.in.deviceID	2012-07-07 22:50:42.000000000 +0200
-+++ splix/ppd/samsung.drv.in	2013-07-27 09:15:51.338716048 +0200
+--- splix/ppd/samsung.drv.in.deviceID	2013-08-26 21:45:31.000000000 +0200
++++ splix/ppd/samsung.drv.in	2013-09-02 13:56:57.002669362 +0200
 @@ -39,6 +39,7 @@ Manufacturer "Samsung"
              Resolution k 1 0 0 0 "300dpi/300 DPI"
   
@@ -41,7 +41,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml2510.ppd"
                  }
              }
-@@ -193,6 +198,7 @@ Manufacturer "Samsung"
+@@ -193,15 +198,18 @@ Manufacturer "Samsung"
      
                  {
                      ModelName "ML-1660"
@@ -49,8 +49,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml1660.ppd"
                  } {
                      ModelName "ML-1910"
-@@ -202,9 +208,11 @@ Manufacturer "Samsung"
-                     PCFileName "ml1915.ppd"
+                     PCFileName "ml1910.ppd"
                  } {
                      ModelName "ML-2525"
 +                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2525 Series;CMD:GDI,FWV,EXT;"
@@ -61,7 +60,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml2525w.ppd"
                  }
              } {
-@@ -414,6 +422,7 @@ Manufacturer "Samsung"
+@@ -465,6 +473,7 @@ Manufacturer "Samsung"
          Attribute General CMSFile "CLP-310"
  
          ModelName "CLP-310"
@@ -70,8 +69,8 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
      }{
          Attribute General CMSFile "CLP-315"
 diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
---- splix/ppd/xerox.drv.in.deviceID	2011-07-21 17:22:26.000000000 +0200
-+++ splix/ppd/xerox.drv.in	2013-07-27 08:59:41.703838152 +0200
+--- splix/ppd/xerox.drv.in.deviceID	2013-08-26 17:22:00.000000000 +0200
++++ splix/ppd/xerox.drv.in	2013-09-02 13:55:22.634957854 +0200
 @@ -66,6 +66,7 @@ Manufacturer "Xerox"
                  } {
                      #import "manualduplex.defs"
diff --git a/splix.spec b/splix.spec
index 7856756..1abe235 100644
--- a/splix.spec
+++ b/splix.spec
@@ -1,17 +1,17 @@
-%global checkout 20121128svn
+%global checkout 20130902svn
 
 Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
 Name: splix
 Version: 2.0.1
-Release: 0.18.%{checkout}%{?dist}
+Release: 0.19.%{checkout}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://splix.sourceforge.net/
 
-# This is a SVN snapshot downloaded via
-# http://splix.svn.sourceforge.net/viewvc/splix/splix/?view=tar
+# This is a SVN snapshot downloaded via 'Download Snapshot' from
+# https://sourceforge.net/p/splix/code/315/tree/
 # and renamed to follow naming guidelines
-Source0: splix-%{version}.%{checkout}.tar.gz
+Source0: splix-%{version}.%{checkout}.tar.bz2
 
 # IEEE 1284 Device IDs
 Patch0:  splix-deviceID.patch
@@ -36,9 +36,10 @@ Splix doesn't support old SPL(1) printers.
 %prep
 %setup -q -n splix
 
+# remove old PPDs (not sure why some PPDs are outside ppd/)
+rm -f *.ppd
+
 pushd ppd
-# rename *.drv to *.drv.in
-for i in *.drv; do mv $i ${i}.in; done
 # remove old PPDs
 make distclean
 popd
@@ -46,9 +47,8 @@ popd
 %patch0 -p1 -b .deviceID
 
 %build
-pushd ppd
+# *.drv.in -> *.drv
 make drv
-popd
 
 CXXFLAGS="%{optflags} -fno-strict-aliasing" \
 make all V=1 DRV_ONLY=1 %{?_smp_mflags}
@@ -63,6 +63,9 @@ make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot}
 %{_datadir}/cups/drv/splix
 
 %changelog
+* Mon Sep 02 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.19.20130902svn
+- Latest upstream snapshot.
+
 * Sat Jul 27 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.18.20121128svn
 - Add Device ID for Samsung CLP-310 (#988926)