rpms/jasper/EL-5 jpc_dec.c.patch,NONE,1.1 jasper.spec,1.20,1.21

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26650

Modified Files:
	jasper.spec 
Added Files:
	jpc_dec.c.patch 
Log Message:
* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
  (#481284, #481291)


jpc_dec.c.patch:

--- NEW FILE jpc_dec.c.patch ---
diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
@@ -1069,12 +1069,12 @@
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-5/jasper.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jasper.spec	23 May 2007 19:19:15 -0000	1.20
+++ jasper.spec	25 Jan 2009 16:22:45 -0000	1.21
@@ -1,28 +1,17 @@
 
 # NOTE: packages that can use jasper:
 # ImageMagick
-# kdelibs
 # netpbm
 
-# define to use GeoJasper
-#define geo 1
-
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 2%{?dist}
+Release: 9%{?dist}
 
-License: JasPer License Version 2.0
-%if "%{?geo:1}" == "1"
-%define  geojasper_ver 1.2.9
-URL:	 http://www.dimin.net/software/utils.html
-Source:  http://dimin.m6.net/software/utils/geojasper_src.zip
-Provides: geojasper = %{geojasper_ver}
-%else
+License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
@@ -31,42 +20,52 @@
 # CVE-2007-2721 (bug #240397)
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
 Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
+Patch4: jpc_dec.c.patch
+
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
 from the JP2 and JPC formats.
 
 %package devel
-Summary: JPEG-2000 library developer files
+Summary: Header files, libraries and developer documentation
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Provides: libjasper-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
 %description devel
 %{summary}.
 
+%package libs 
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+%description libs 
+%{summary}.
+
+%package utils 
+Summary: Nonessential utilities for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description utils 
+%{summary}, including jiv and tmrdemo.
+
+
 
 %prep
-%setup -q -n %{name}-%{version}%{?geo:.GEO}
+%setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
-
-%if "%{?geo:1}" == "1"
-chmod +x configure configure.ac
-%patch2 -p1 -b .GL-ac
-libtoolize --force
-aclocal
-autoconf
-autoheader
-automake -a
-%endif
-
+%patch4 -p1 -b .jpc_dec_assertion
 
 
 %build
@@ -96,30 +95,60 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
-%{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/*jasper*
-%{_bindir}/tmrdemo
-%{_libdir}/lib*.so.*
-%{_mandir}/man1/*
+%{_bindir}/jasper
+%{_mandir}/man1/img*
+%{_mandir}/man1/jasper.1*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/lib*.so
+%{_libdir}/libjasper.so
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
+%{_libdir}/libjasper.so.1*
+
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/jiv
+%{_bindir}/tmrdemo
+%{_mandir}/man1/jiv.1*
 
 
 %changelog
+* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
+- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
+  (#481284, #481291)
+
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-8
+- respin (gcc43)
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-7
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-6
+- -libs: -Requires: %%name
+- -devel: +Provides: libjasper-devel
+- drop (unused) geojasper bits
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4
+- -libs subpkg to be multilib friendlier
+- -utils subpkg for non-essential binaries jiv, tmrdemo (#244153)
+
+* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-3
+- License: JasPer
+
 * Wed May 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-2
 - CVE-2007-2721 (#240397)