- Fix defattr line.

[fedora-mingw.git] / jasper / mingw32-jasper.spec

diff --git a/jasper/mingw32-jasper.spec b/jasper/mingw32-jasper.spec
index fcbd9c9..8896784 100644 (file)
--- a/jasper/mingw32-jasper.spec
+++ b/jasper/mingw32-jasper.spec
@@ -6,26 +6,37 @@
 
 Name:           mingw32-jasper
 Version:        1.900.1
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW Windows Jasper library
 
 License:        JasPer
+Group:          Development/Libraries
+
 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-mingw32.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)
 
+# Patches from Fedora native package.
+# OpenGL is disabled in this build, so we don't need this patch:
+#Patch1:         jasper-1.701.0-GL.patch
+# Note patch2 appears in native package, but is not applied:
+#Patch2:         jasper-1.701.0-GL-ac.patch
+Patch3:         patch-libjasper-stepsizes-overflow.diff
+
+# MinGW-specific patches.
+# This patch adds '-no-undefined' flag to libtool line:
+Patch1000:      jasper-1.900.1-mingw32.patch
+# This patch is a bit of a hack, but it's just there to fix a demo program:
+Patch1001:      jasper-1.900.1-sleep.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-libjpeg
-BuildRequires:  autoconf automake libtool
+BuildRequires:  mingw32-dlfcn
+
 
 %description
 MinGW Windows Jasper library.
@@ -33,16 +44,16 @@ MinGW Windows Jasper library.
 
 %prep
 %setup -q -n jasper-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch3 -p1 -b .CVE-2007-2721
+
+%patch1000 -p1 -b .mingw32
+%patch1001 -p1 -b .sleep
 
 
 %build
-autoreconf
-%{_mingw32_configure} --disable-opengl --enable-libjpeg
-make
+%{_mingw32_configure} \
+  --disable-opengl --enable-libjpeg --disable-static --enable-shared
+make %{?_smp_mflags}
 
 
 %install
@@ -50,7 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir}
 
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjasper.a
+# Remove the manual pages - don't duplicate documentation which
+# is in the native Fedora package.
+rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/*
 
 
 %clean
@@ -58,8 +71,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
-# XXX dlls
+%defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
 %{_mingw32_bindir}/i686-pc-mingw32-imgcmp.exe
 %{_mingw32_bindir}/i686-pc-mingw32-imginfo.exe
 %{_mingw32_bindir}/i686-pc-mingw32-jasper.exe
@@ -68,13 +81,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libjasper.dll.a
 %{_mingw32_libdir}/libjasper.la
 %{_mingw32_includedir}/jasper/
-%{_mingw32_mandir}/man1/i686-pc-mingw32-imgcmp.1*
-%{_mingw32_mandir}/man1/i686-pc-mingw32-imginfo.1*
-%{_mingw32_mandir}/man1/i686-pc-mingw32-jasper.1*
-%{_mingw32_mandir}/man1/i686-pc-mingw32-jiv.1*
 
 
 %changelog
+* Mon Mar  9 2009 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-8
+- Fix defattr line.
+- Remove the enable-shared patch, and just use --enable-shared on
+  the configure line.
+- Disable the GL patch since OpenGL is disabled.
+- Document what the patches are for in the spec file.
+- Only patch Makefile.in so we don't have to rerun autotools, and
+  remove autotools dependency.
+
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-7
+- Rebuild for mingw32-gcc 4.4
+
+* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-6
+- Use _smp_mflags.
+- Disable static libraries.
+- Include documentation.
+- Use the same patches as Fedora native package.
+- Just run autoconf instead of autoreconf so we don't upgrade libtool.
+- +BR mingw32-dlfcn.
+- Don't need the manual pages.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-5
 - Rename mingw -> mingw32.