From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Wed, 10 Sep 2008 16:54:07 +0000 (+0100)
Subject: Fix build of DLLs.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d1558a886d084bccf9039a8b5551fa18cd2b121a;p=fedora-mingw.git

Fix build of DLLs.
---

diff --git a/jasper/jasper-1.900.1-enable-shared.patch b/jasper/jasper-1.900.1-enable-shared.patch
new file mode 100644
index 0000000..bfd8415
--- /dev/null
+++ b/jasper/jasper-1.900.1-enable-shared.patch
@@ -0,0 +1,10 @@
+--- jasper-1.900.1.orig/configure.ac	2007-01-19 21:47:11.000000000 +0000
++++ jasper-1.900.1/configure.ac	2008-09-10 17:31:27.000000000 +0100
+@@ -152,7 +152,6 @@
+ # AC_PROG_CPP
+ # AC_PROG_LN_S
+ 
+-AM_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+ 
+ AC_PATH_XTRA
diff --git a/jasper/mingw-jasper.spec b/jasper/mingw-jasper.spec
index 9c1ccf1..26e6d41 100644
--- a/jasper/mingw-jasper.spec
+++ b/jasper/mingw-jasper.spec
@@ -2,14 +2,15 @@
 
 Name:           mingw-jasper
 Version:        1.900.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Jasper library
 
-License: JasPer
-URL:     http://www.ece.uvic.ca/~mdadams/jasper/
-Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-Patch1: jasper-%{version}-sleep.patch
-Patch2: jasper-%{version}-mingw.patch
+License:        JasPer
+URL:            http://www.ece.uvic.ca/~mdadams/jasper/
+Source0:        http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
+Patch1:         jasper-1.900.1-sleep.patch
+Patch2:         jasper-1.900.1-mingw.patch
+Patch3:         jasper-1.900.1-enable-shared.patch
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +29,8 @@ MinGW Windows Jasper library.
 %setup -q -n jasper-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
 
 %build
 %{_mingw_configure} --disable-opengl --enable-libjpeg
@@ -39,6 +42,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw_mandir}
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjasper.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,14 +55,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_bindir}/i686-pc-mingw32-imginfo.exe
 %{_mingw_bindir}/i686-pc-mingw32-jasper.exe
 %{_mingw_bindir}/i686-pc-mingw32-tmrdemo.exe
-%{_mingw_includedir}/jasper/
-%{_mingw_libdir}/libjasper.a
+%{_mingw_bindir}/libjasper-1.dll
+%{_mingw_libdir}/libjasper.dll.a
 %{_mingw_libdir}/libjasper.la
+%{_mingw_includedir}/jasper/
 %{_mingw_mandir}/man1/i686-pc-mingw32-imgcmp.1*
 %{_mingw_mandir}/man1/i686-pc-mingw32-imginfo.1*
 %{_mingw_mandir}/man1/i686-pc-mingw32-jasper.1*
 %{_mingw_mandir}/man1/i686-pc-mingw32-jiv.1*
 
 %changelog
-* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-2
+- Enable DLLs.
+- Remove static libraries.
+
+* Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-1
 - Initial RPM release