From 24c0d2b8f3bd5865cb496cc1e7a694f4187b43ca550e4e6d59e66d18bd1e0a43 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Thu, 1 Aug 2013 09:57:10 +0000
Subject: [PATCH] Accepting request 185411 from home:jsmeix:branches:Printing

epson-inkjet-printer-escpr version upgrade to 1.2.3

OBS-URL: https://build.opensuse.org/request/show/185411
OBS-URL: https://build.opensuse.org/package/show/Printing/epson-inkjet-printer-escpr?expand=0&rev=11
---
 ...-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz |  3 +++
 epson-inkjet-printer-escpr.changes            | 23 +++++++++++++++++++
 epson-inkjet-printer-escpr.spec               | 15 +++++++-----
 fix_no-return-in-nonvoid-function.patch       | 10 ++++++++
 4 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 epson-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz
 create mode 100644 fix_no-return-in-nonvoid-function.patch

diff --git a/epson-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz b/epson-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz
new file mode 100644
index 0000000..52a327b
--- /dev/null
+++ b/epson-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f11f6055dbc57ad220ef1c122cd4f4c74e2cab4f918bf33d8e7149ad11224d6
+size 1555235
diff --git a/epson-inkjet-printer-escpr.changes b/epson-inkjet-printer-escpr.changes
index 1310ec1..625f029 100644
--- a/epson-inkjet-printer-escpr.changes
+++ b/epson-inkjet-printer-escpr.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Aug  1 11:34:39 CEST 2013 - jsmeix@suse.de
+
+- fix_no-return-in-nonvoid-function.patch avoids that build fails
+  with "E: ... no-return-in-nonvoid-function filter.c:133".
+- Upgraded to version 1.2.3
+  Several more supported XP series devices.
+  For details see the NEWS file.
+- Upgraded to version 1.2.2
+  Many more supported devices.
+  For details see the NEWS file.
+- Upgraded to version 1.2.1
+  Fixed issue where borderless printing except for A4 size failed.
+  A few more supported devices.
+  For details see the NEWS file.
+- Upgraded to version 1.2.0
+  A few more supported devices.
+  Supported duplex printing for many models.
+  For details see the NEWS file.
+- Upgraded to version 1.1.2:
+  Several more supported WP series devices.
+  For details see the NEWS file.
+
 -------------------------------------------------------------------
 Fri Feb 22 14:36:31 CET 2013 - jsmeix@suse.de
 
diff --git a/epson-inkjet-printer-escpr.spec b/epson-inkjet-printer-escpr.spec
index 12f298e..7b665d5 100644
--- a/epson-inkjet-printer-escpr.spec
+++ b/epson-inkjet-printer-escpr.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           epson-inkjet-printer-escpr
 BuildRequires:  cups
 BuildRequires:  cups-devel
@@ -28,14 +27,17 @@ BuildRequires:  cups-devel
 %if 0%{?suse_version} > 1010
 BuildRequires:  python-cups
 %endif
-Version:        1.1.1
+Version:        1.2.3
 Release:        0
 Url:            http://avasys.jp/english/linux_e/
 Summary:        Epson ESC/P-R Inkjet Printer Driver
 License:        GPL-2.0
 Group:          Hardware/Printing
-# URL to download Source0: http://avasys.jp/eng/linux_driver/download/lsb/epson-inkjet/escpr/
+# Example URL to download Source0: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX&productName=B700
 Source0:        epson-inkjet-printer-escpr-%{version}-1lsb3.2.tar.gz
+# Patch0 fix_no-return-in-nonvoid-function.patch avoids that build fails
+# with "E: epson-inkjet-printer-escpr no-return-in-nonvoid-function filter.c:133":
+Patch0:         fix_no-return-in-nonvoid-function.patch
 # This software is a filter program used with CUPS:
 Requires:       cups
 # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
@@ -76,6 +78,9 @@ http://global.epson.com/innovation/universal_printing/index.html
 %prep
 # Be quiet when unpacking:
 %setup -q
+# Patch0 fix_no-return-in-nonvoid-function.patch avoids that build fails
+# with "E: epson-inkjet-printer-escpr no-return-in-nonvoid-function filter.c:133":
+%patch0
 
 %build
 # Set our preferred architecture-specific flags for the compiler and linker:
@@ -90,7 +95,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 # must match exactly to the installed epson-escpr filter and the libescpr library:
 %configure \
         --with-cupsfilterdir=/usr/lib/cups/filter \
-        --with-cupsppddir=%{_datadir}/cups/model/manufacturer-PPDs/epson-inkjet-printer-escpr
+        --with-cupsppddir=%{_datadir}/cups/model/manufacturer-PPDs
 make
 
 %install
@@ -154,8 +159,6 @@ exit 0
 %dir %{_datadir}/cups/model
 %dir %{_datadir}/cups/model/manufacturer-PPDs
 %{_datadir}/cups/model/manufacturer-PPDs/epson-inkjet-printer-escpr/
-%dir %{_datadir}/epson-inkjet-printer-escpr
-%{_datadir}/epson-inkjet-printer-escpr/paper_list.csv
 %doc %{_defaultdocdir}/%{name}/
 
 %changelog
diff --git a/fix_no-return-in-nonvoid-function.patch b/fix_no-return-in-nonvoid-function.patch
new file mode 100644
index 0000000..f856470
--- /dev/null
+++ b/fix_no-return-in-nonvoid-function.patch
@@ -0,0 +1,10 @@
+--- src/filter.c.orig	2013-06-04 08:04:30.000000000 +0200
++++ src/filter.c	2013-08-01 11:28:16.000000000 +0200
+@@ -130,6 +130,7 @@ EPS_ERR_CODE epsInitLib(){
+ 	cmnFuncPtrs.stateCallback = NULL; /* current version unused */
+ 
+ 	memcpy((void*)(&epsCmnFnc), (void*)&cmnFuncPtrs, sizeof(EPS_CMN_FUNC));
++	return EPS_ERR_NONE;
+ }
+ 
+ EPS_ERR_CODE epsInitJob(){