-%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-libjpeg
Version: 6b
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
URL: http://www.ijg.org/
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
-Source1: libjpeg-configure.in
+Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.bz2
+Source1: configure.in
Patch1: jpeg-c++.patch
Patch4: libjpeg-cflags.patch
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 19
+BuildRequires: mingw-filesystem >= 23
BuildRequires: mingw-gcc
BuildRequires: mingw-binutils
BuildRequires: mingw-libpng
mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1
make prefix=$RPM_BUILD_ROOT%{_mingw_prefix} install
-# Work around the broken makefiles...
-mv $RPM_BUILD_ROOT%{_mingw_prefix}/man/man1/*.1 $RPM_BUILD_ROOT%{_mingw_mandir}/man1
-
# Remove static library.
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libjpeg.a
+# Remove manual pages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_prefix}/man
+
%clean
rm -rf $RPM_BUILD_ROOT
%{_mingw_includedir}/jpeglib.h
%{_mingw_libdir}/libjpeg.dll.a
%{_mingw_libdir}/libjpeg.la
-%{_mingw_mandir}/man1/cjpeg.1*
-%{_mingw_mandir}/man1/djpeg.1*
-%{_mingw_mandir}/man1/jpegtran.1*
-%{_mingw_mandir}/man1/rdjpgcom.1*
-%{_mingw_mandir}/man1/wrjpgcom.1*
+
%changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-4
+- Switch to tar.bz2 source, and rename configure.in
+
+* Sun Sep 21 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-3
+- Fix URL.
+- Remove manpages which duplicate Fedora native.
+
* Wed Sep 10 2008 Daniel P. Berrange <berrange@redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.