2.7

.gitignore

@@ -1,2 +1,3 @@
 /c2esp26.tar.gz
 /c2esp27~rc1.tar.gz
+/c2esp-27.tar.gz

c2esp-jbig.patch

@@ -1,12 +0,0 @@
-diff -up c2esp27~rc1/Makefile.jbig c2esp27~rc1/Makefile
---- c2esp27~rc1/Makefile.jbig	2013-12-17 01:04:13.000000000 +0100
-+++ c2esp27~rc1/Makefile	2013-12-19 13:37:36.920169463 +0100
-@@ -44,7 +44,7 @@ FILTERS=	c2esp c2espC command2esp
- # The jbig library. Debian and derivatives should now have the jbig library -ljbig
- # -ljbig also contains jbig85
- 	LIBJBIG := -ljbig
--	LIBJBIG85 := -ljbig
-+	LIBJBIG85 := -ljbig85
- 
- BINPROGS=
- ESPDRVFILE = KodakESP_16.drv

c2esp.spec

@@ -1,16 +1,13 @@
 %global version_no_dot 27
-%global alphatag rc1
 
 Name:           c2esp
 Version:        2.7
-Release:        0.1.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        CUPS driver for Kodak AiO printers
 
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/cupsdriverkodak/
-Source0:        http://downloads.sourceforge.net/cupsdriverkodak/c2esp%{version_no_dot}~%{alphatag}.tar.gz
-
-Patch0:         c2esp-jbig.patch
+Source0:        http://downloads.sourceforge.net/cupsdriverkodak/c2esp-%{version_no_dot}.tar.gz
 
 
 # _cups_serverbin macro
@@ -33,34 +30,28 @@ CUPS filters and drivers for Kodak ESP and Hero all in one printers.
 
 
 %prep
-%setup -q -n c2esp%{version_no_dot}~%{alphatag}
-
-%patch0 -p1 -b .jbig
+%setup -q -n c2esp-%{version_no_dot}
 
 %build
-# Makefile is not ready for %%{?_smp_mflags} (config.h is a shared resource)
-CFLAGS="%{optflags}" \
-make all
+
+%configure
+make %{_smp_mflags} -C src/
 
 %install
-make install DESTDIR=%{buildroot}
-
-# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
-mkdir __doc
-mv  %{buildroot}%{_datadir}/doc/c2esp/* __doc
-rm -rf %{buildroot}%{_datadir}/doc/c2esp
-
-# useless
-rm -f %{buildroot}%{_bindir}/c2esplog
+# do not install doc/ or scripts/
+make -C src/ install DESTDIR=%{buildroot}
 
 %files
-%doc __doc/COPYING __doc/README __doc/c2esp.txt
+%doc doc/COPYING doc/README
 %{_cups_serverbin}/filter/c2esp
 %{_cups_serverbin}/filter/c2espC
 %{_cups_serverbin}/filter/command2esp
 %{_datadir}/cups/drv/c2esp
 
 %changelog
+* Sun Dec 29 2013 Jiri Popelka <jpopelka@redhat.com> - 2.7-1
+- 2.7
+
 * Thu Dec 19 2013 Jiri Popelka <jpopelka@redhat.com> - 2.7-0.1.rc1
 - 2.7~rc1
 

sources

@@ -1 +1 @@
-6b37103592a419e855f5adafee6c95c0  c2esp27~rc1.tar.gz
+e4a0a8617ba80f86d159b5c36208ab6c  c2esp-27.tar.gz