X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libjpeg.git;a=blobdiff_plain;f=crossmingw32-libjpeg.spec;h=1ff8578ab18c8caa5938fc644e513a76b6ff85ec;hp=3d9cb22c9e2fa33c2ea684f90f1efd4089140457;hb=e934179f12d8d575547840d64b0dd95c91a2513a;hpb=78b067712e6971e8a5f7dfa86726319cbdb94f70

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index 3d9cb22..1ff8578 100644
--- a/crossmingw32-libjpeg.spec
+++ b/crossmingw32-libjpeg.spec
@@ -1,17 +1,14 @@
 %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:	6
+Version:	9a
+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:	3353992aecaee1805ef4109aadd433e7
+Patch0:		%{realname}-maxmem-sysconf.patch
 URL:		http://www.ijg.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -37,6 +34,10 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		optflags	-O2
 %endif
 
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define		filterout_ld	-Wl,-z,.*
+%define		filterout_c	-f[-a-z0-9=]*
+
 %description
 The libjpeg package contains a library of functions for manipulating
 JPEG images.
@@ -49,16 +50,16 @@ Ten pakiet zawiera bibliotekę funkcji do manipulacji plikami jpeg.
 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
@@ -75,50 +76,27 @@ libjpeg - biblioteka DLL dla 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}
 
@@ -139,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/jerror.h
 %{_includedir}/jmorecfg.h
 %{_includedir}/jpeglib.h
+%{_includedir}/jversion.h
 
 %files static
 %defattr(644,root,root,755)
@@ -146,4 +125,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libjpeg-*.dll
+%{_dlldir}/libjpeg-9.dll