%define realname libjpeg
-Summary: Library for handling different jpeg files - Mingw32 cross version
-Summary(pl.UTF-8): Biblioteka do manipulacji plikami w formacie jpeg - wersja skrośna dla Mingw32
+Summary: Library for handling different jpeg files - MinGW32 cross version
+Summary(pl.UTF-8): Biblioteka do manipulacji plikami w formacie jpeg - wersja skrośna dla MinGW32
Name: crossmingw32-%{realname}
-Version: 6b
-Release: 5
+Version: 8d
+Release: 1
License: distributable
Group: Development/Libraries
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
-# Source0-md5: dbd5f3b47ed13132f04c685d608a7547
-Patch0: %{realname}-DESTDIR.patch
-Patch1: %{realname}-include.patch
-Patch2: %{realname}-c++.patch
-Patch3: %{name}-shared.patch
+Source0: http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz
+# Source0-md5: 52654eb3b2e60c35731ea8fc87f1bd29
+Patch0: %{realname}-maxmem-sysconf.patch
URL: http://www.ijg.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
%define optflags -O2
%endif
+# -z options are invalid for mingw linker
+%define filterout_ld -Wl,-z,.*
%description
The libjpeg package contains a library of functions for manipulating
Ten pakiet zawiera wersję skrośną dla Win32.
%package static
-Summary: Static libjpeg library (cross mingw32 version)
-Summary(pl.UTF-8): Statyczna biblioteka libjpeg (wersja skrośna mingw32)
+Summary: Static libjpeg library (cross MinGW32 version)
+Summary(pl.UTF-8): Statyczna biblioteka libjpeg (wersja skrośna MinGW32)
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description static
-Static libjpeg library (cross mingw32 version).
+Static libjpeg library (cross MinGW32 version).
%description static -l pl.UTF-8
-Statyczna biblioteka libjpeg (wersja skrośna mingw32).
+Statyczna biblioteka libjpeg (wersja skrośna MinGW32).
%package dll
Summary: libjpeg - DLL library for Windows
%prep
%setup -q -n jpeg-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-cp /usr/share/automake/config.* .
-
-# hack: use recent libtool by configuring for mingw32 in separate dir
-# (cannot regenerate main ac/lt because of missing configure.in)
-mkdir lthack
-cd lthack
-cat >configure.ac <<EOF
-AC_INIT(lthack, 0)
-AC_CONFIG_AUX_DIR(..)
-AC_PROG_LIBTOOL
-EOF
%build
-cd lthack
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%configure \
- --target=%{target} \
- --host=%{target}
-cd ..
-
%configure \
--target=%{target} \
--host=%{target} \
- --enable-shared \
- --enable-static
-
-cp -f lthack/libtool .
+ --disable-silent-rules
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_dlldir}}
-%{__make} install-headers install-lib \
- libdir=%{_libdir} \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+install jversion.h $RPM_BUILD_ROOT%{_includedir}
+
+# remove HAVE_STD{DEF,LIB}_H
+# (not necessary but may generate warnings confusing autoconf)
+sed -i -e 's#.*HAVE_STD..._H.*##g' $RPM_BUILD_ROOT%{_includedir}/jconfig.h
+
install -d $RPM_BUILD_ROOT%{_dlldir}
mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
%{_includedir}/jerror.h
%{_includedir}/jmorecfg.h
%{_includedir}/jpeglib.h
+%{_includedir}/jversion.h
%files static
%defattr(644,root,root,755)