mingw -> mingw32 rename and miscellanous related fixes.

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

diff --git a/jasper/mingw-jasper.spec b/jasper/mingw32-jasper.spec
similarity index 53%
rename from jasper/mingw-jasper.spec
rename to jasper/mingw32-jasper.spec
index d8e8cad..fcbd9c9 100644 (file)
--- a/jasper/mingw-jasper.spec
+++ b/jasper/mingw32-jasper.spec
@@ -1,19 +1,19 @@
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
 
-Name:           mingw-jasper
+Name:           mingw32-jasper
 Version:        1.900.1
-Release:        4%{?dist}
+Release:        5%{?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-1.900.1-sleep.patch
-Patch2:         jasper-1.900.1-mingw.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
@@ -21,10 +21,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 23
-BuildRequires:  mingw-gcc
-BuildRequires:  mingw-binutils
-BuildRequires:  mingw-libjpeg
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-libjpeg
 BuildRequires:  autoconf automake libtool
 
 %description
@@ -41,16 +41,16 @@ MinGW Windows Jasper library.
 
 %build
 autoreconf
-%{_mingw_configure} --disable-opengl --enable-libjpeg
+%{_mingw32_configure} --disable-opengl --enable-libjpeg
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw_mandir}
+make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir}
 
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjasper.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjasper.a
 
 
 %clean
@@ -60,21 +60,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 # XXX dlls
-%{_mingw_bindir}/i686-pc-mingw32-imgcmp.exe
-%{_mingw_bindir}/i686-pc-mingw32-imginfo.exe
-%{_mingw_bindir}/i686-pc-mingw32-jasper.exe
-%{_mingw_bindir}/i686-pc-mingw32-tmrdemo.exe
-%{_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*
+%{_mingw32_bindir}/i686-pc-mingw32-imgcmp.exe
+%{_mingw32_bindir}/i686-pc-mingw32-imginfo.exe
+%{_mingw32_bindir}/i686-pc-mingw32-jasper.exe
+%{_mingw32_bindir}/i686-pc-mingw32-tmrdemo.exe
+%{_mingw32_bindir}/libjasper-1.dll
+%{_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
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.900.1-5
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.900.1-4
 - Add overflow patch from rawhide