From 8c016e7a61be466c7206c391c9bf2b270adcb217 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Thu, 19 Apr 2012 13:30:20 +0200
Subject: [PATCH] Build splix with JBIG1 support and install DRV files instead
 of PPD files.

---
 splix.spec | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/splix.spec b/splix.spec
index 60db68e..9c8fcc3 100644
--- a/splix.spec
+++ b/splix.spec
@@ -19,15 +19,15 @@ Patch0:  splix-deviceID.patch
 
 Requires: cups
 
-# PPD re-compilation
-BuildRequires: cups, recode
-
 # _cups_serverbin macro
 BuildRequires: cups-devel
 
 # postscriptdriver tags
 BuildRequires: python-cups
 
+# JBIG1 lossless image compression
+BuildRequires: jbigkit-devel
+
 %description
 This driver is usable by all printer devices which understand the QPDL
 (Quick Page Description Language) also known as SPL2 (Samsung Printer Language)
@@ -47,34 +47,18 @@ make distclean
 popd
 
 %build
-# The situation is that we can't ship jbigkit (JBIG1 implementation) in Fedora
-# because of one known patent. It can be found in rpmfusion-free repository.
-# DISABLE_JBIG=1 prevents splix from building against jbigkit and also from
-# installing PPD files for printers that require JBIG1 support.
-#
-# Luckily JBIG1 will be free of known patents in all countries from
-# 2012-04-04 onwards. (http://www.cl.cam.ac.uk/~mgk25/jbigkit/patents/)
-# So once jbigkit is in Fedora we could do the following with this spec:
-# - remove DISABLE_JBIG=1
-# - replace 'make ppd' with 'make drv'
-# - remove cups and recode from BuildRequires
-# - add 'DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix' to make install
-# That will result in building splix with JBIG1 support and also
-# installing DRV files instead of only selected set of PPD files.
-
 pushd ppd
-make ppd
+make drv
 popd
 
-DISABLE_JBIG=1 \
 V=1 \
+DRV_ONLY=1 \
 CXXFLAGS="%{optflags} -fno-strict-aliasing" \
 make %{?_smp_mflags}
 
-
 %install
-DISABLE_JBIG=1 \
-CUPSPPD=%{_datadir}/cups/model/splix \
+DRV_ONLY=1 \
+CUPSDRV=%{_datadir}/cups/drv/splix \
 DESTDIR=%{buildroot} \
 make install
 
@@ -82,11 +66,12 @@ make install
 %doc COPYING AUTHORS ChangeLog THANKS
 %{_cups_serverbin}/filter/pstoqpdl
 %{_cups_serverbin}/filter/rastertoqpdl
-%{_datadir}/cups/model/splix/
+%{_datadir}/cups/drv/splix/
 
 %changelog
 * Thu Apr 19 2012 Jiri Popelka <jpopelka@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.
 
 * Wed Jan 18 2012 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.8.20111121svn
 - Add Device ID for Samsung ML-1660.