X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=jasper%2Fmingw-jasper.spec;h=d8e8cad21f234ce370f767765ea1b84428d39617;hb=38c89b4daedbf23d96dd48909223937f5ce92312;hp=26e6d413708b199ce170eecd29ce29ce1d9797c2;hpb=d1558a886d084bccf9039a8b5551fa18cd2b121a;p=fedora-mingw.git

diff --git a/jasper/mingw-jasper.spec b/jasper/mingw-jasper.spec
index 26e6d41..d8e8cad 100644
--- a/jasper/mingw-jasper.spec
+++ b/jasper/mingw-jasper.spec
@@ -1,8 +1,12 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-jasper
 Version:        1.900.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Jasper library
 
 License:        JasPer
@@ -11,15 +15,17 @@ Source0:        http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version
 Patch1:         jasper-1.900.1-sleep.patch
 Patch2:         jasper-1.900.1-mingw.patch
 Patch3:         jasper-1.900.1-enable-shared.patch
+Patch4:         patch-libjasper-stepsizes-overflow.diff
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libjpeg
+BuildRequires:  autoconf automake libtool
 
 %description
 MinGW Windows Jasper library.
@@ -30,9 +36,11 @@ MinGW Windows Jasper library.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
+autoreconf
 %{_mingw_configure} --disable-opengl --enable-libjpeg
 make
 
@@ -44,6 +52,7 @@ make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw_mandir}
 
 rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjasper.a
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,7 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_mandir}/man1/i686-pc-mingw32-jasper.1*
 %{_mingw_mandir}/man1/i686-pc-mingw32-jiv.1*
 
+
 %changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-4
+- Add overflow patch from rawhide
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-3
+- Run autoreconf after changing configure.ac script and add BRs for autotools
+
 * Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-2
 - Enable DLLs.
 - Remove static libraries.