SPECS: libjpeg.spec - croppatch "patch" converted to diff; still e...

[qboosh]

Author: qboosh                       Date: Sun Jan 27 20:32:15 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- croppatch "patch" converted to diff; still evil, but not conflicting now

---- Files affected:
SPECS:
   libjpeg.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/libjpeg.spec
diff -u SPECS/libjpeg.spec:1.62 SPECS/libjpeg.spec:1.63
--- SPECS/libjpeg.spec:1.62	Sun Jan 27 21:23:17 2008
+++ SPECS/libjpeg.spec	Sun Jan 27 21:32:10 2008
@@ -6,7 +6,7 @@
 #
 # Conditional build:
 %bcond_with	arith	# arithmetic coding support (changes error codes in ABI, patent problems somewhere)
-%bcond_with	crop	# "apply" crop pseudo-patch (changes error codes in ABI, conflicts with arith patch)
+%bcond_with	crop	# lossless cropping support (changes error codes in ABI)
 #
 Summary:	Library for handling different JPEG files
 Summary(de.UTF-8):	Library zum Verarbeiten verschiedener JPEG-Dateien
@@ -26,8 +26,6 @@
 # Source0-md5:	dbd5f3b47ed13132f04c685d608a7547
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	d6342c015a489de275ada637a77dc2b0
-Source2:	http://sylvana.net/jpegcrop/croppatch.tar.gz
-# Source2-md5:	45d76e4226232439308e2129b64c4ea1
 Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-arm.patch
 Patch2:		%{name}-include.patch
@@ -35,6 +33,8 @@
 Patch4:		%{name}-libtool.patch
 # from http://sylvana.net/jpeg-ari/jpeg-ari-28mar98.tar.gz
 Patch5:		%{name}-arith.patch
+# from http://sylvana.net/jpegcrop/croppatch.tar.gz
+Patch6:		%{name}-crop.patch
 URL:		http://www.ijg.org/
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -187,13 +187,7 @@
 %patch3 -p1
 %patch4 -p1
 %{?with_arith:%patch5 -p1}
-
-%if %{with crop}
-mkdir croppatch
-gzip -dc %{SOURCE2} | tar xf - -C croppatch
-# evil: jerror.h change breaks error codes in ABI
-cp croppatch/{jerror.h,jpegtran.c,transupp.c,transupp.h} .
-%endif
+%{?with_crop:%patch6 -p1}
 
 cp -f %{_datadir}/libtool/config.sub .
 
@@ -276,6 +270,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2008-01-27 20:32:10  qboosh
+- croppatch "patch" converted to diff; still evil, but not conflicting now
+
 Revision 1.62  2008-01-27 20:23:17  qboosh
 - added arith patch and bcond (arithmetic encoding, off by default)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libjpeg.spec?r1=1.62&r2=1.63&f=u