X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libjpeg.git;a=blobdiff_plain;f=crossmingw32-libjpeg.spec;h=5c8e7578aa26a930f5d50533cf9ed2ddea8d8fc9;hp=c3ef8c9ac1b1959f77fb980f749061b98f55d834;hb=bc8a9ee5f9d23e03b3fc1c0c38f8c9fb892a6156;hpb=e643b59a619dcea18d55c3e365b61ddbae0914db

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index c3ef8c9..5c8e757 100644
--- a/crossmingw32-libjpeg.spec
+++ b/crossmingw32-libjpeg.spec
@@ -1,104 +1,126 @@
 %define		realname	libjpeg
-Summary:	Library for handling different jpeg files - Mingw32 cross version
-Summary(pl):	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:	3
+Version:	8d
+Release:	1
 License:	distributable
-Group:		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
+Group:		Development/Libraries
+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
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	crossmingw32-w32api
 BuildRequires:	libtool
+Requires:	crossmingw32-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
-%define		target		i386-mingw32
-%define		target_platform	i386-pc-mingw32
-%define		arch		%{_prefix}/%{target}
-%define		gccarch		%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib		%{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define		target			i386-mingw32
+%define		target_platform 	i386-pc-mingw32
 
-%define		__cc		%{target}-gcc
-%define		__cxx		%{target}-g++
+%define		_sysprefix		/usr
+%define		_prefix			%{_sysprefix}/%{target}
+%define		_libdir			%{_prefix}/lib
+%define		_dlldir			/usr/share/wine/windows/system
+%define		__cc			%{target}-gcc
+%define		__cxx			%{target}-g++
 
-%ifarch alpha sparc sparc64 sparcv9
+%ifnarch %{ix86}
+# 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
 JPEG images.
 
-%description -l pl
-Ten pakiet zawiera bibliotekê funkcji do manipulacji plikami jpeg.
+This package contains the cross version for Win32.
+
+%description -l pl.UTF-8
+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)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static libjpeg library (cross MinGW32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libjpeg (wersja skrośna MinGW32).
 
 %package dll
 Summary:	libjpeg - DLL library for Windows
-Summary(pl):	libjpeg - biblioteka DLL dla Windows
+Summary(pl.UTF-8):	libjpeg - biblioteka DLL dla Windows
 Group:		Applications/Emulators
+Requires:	wine
 
 %description dll
 libjpeg - DLL library for Windows.
 
-%description dll -l pl
+%description dll -l pl.UTF-8
 libjpeg - biblioteka DLL dla Windows.
 
 %prep
 %setup -q -n jpeg-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-CC=%{target}-gcc ; export CC
-CXX=%{target}-g++ ; export CXX
-LD=%{target}-ld ; export LD
-AR=%{target}-ar ; export AR
-AS=%{target}-as ; export AS
-CROSS_COMPILE=1 ; export CROSS_COMPILE
-CPPFLAGS="-I%{arch}/include" ; export CPPFLAGS
-RANLIB=%{target}-ranlib ; export RANLIB
-LDSHARED="%{target}-gcc -shared" ; export LDSHARED
-TARGET="%{target}" ; export TARGET
-
 %configure \
 	--target=%{target} \
 	--host=%{target} \
-	--build=i386-linux \
-	--prefix=%{arch}
+	--disable-silent-rules
 
 %{__make}
-%{__make} jpeg.dll
-
-%{target}-strip jpeg.dll
-%{target}-strip -g -R.comment -R.note *.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
 
-install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{arch}/include
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install jpeg.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+%{__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}
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}/include/*
-%{arch}/lib/*
+%doc README change.log
+%{_libdir}/libjpeg.dll.a
+%{_libdir}/libjpeg.la
+%{_includedir}/jconfig.h
+%{_includedir}/jerror.h
+%{_includedir}/jmorecfg.h
+%{_includedir}/jpeglib.h
+%{_includedir}/jversion.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libjpeg.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*
+%{_dlldir}/libjpeg-*.dll