From e044f105f2b86b23a38f8b2bec80cf6a006cfe94 Mon Sep 17 00:00:00 2001
From: wolf <wolf@pld-linux.org>
Date: Sun, 19 Sep 2004 22:42:31 +0000
Subject: [PATCH] - rel 2 - unified

Changed files:
    crossmingw32-bzip2.spec -> 1.5
---
 crossmingw32-bzip2.spec | 56 ++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/crossmingw32-bzip2.spec b/crossmingw32-bzip2.spec
index d1a8cb7..f4257c1 100644
--- a/crossmingw32-bzip2.spec
+++ b/crossmingw32-bzip2.spec
@@ -8,7 +8,7 @@ Summary(uk):	
 Summary(ru):	ëÏÍÐÒÅÓÓÏÒ ÆÁÊÌÏ× ÎÁ ÏÓÎÏ×Å ÁÌÇÏÒÉÔÍÁ ÂÌÏÞÎÏÊ ÓÏÒÔÉÒÏ×ËÉ
 Name:		crossmingw32-%{realname}
 Version:	1.0.2
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Applications/Archiving
 Source0:	ftp://sources.redhat.com/pub/bzip2/v102/%{realname}-%{version}.tar.gz
@@ -83,34 +83,66 @@ bzip2 
 ÒÏÚÐÏ×ÓÀÄÖÅΦ ËÏÍÐÒÅÓÏÒÉ ÎÁ ÂÁÚ¦ LZ77/LZ78 ¦ ÎÁÂÌÉÖÁ¤ÔØÓÑ ÄÏ Ôϧ, ÝÏ
 §§ ÚÁÂÅÚÐÅÞÕ¤ Ó¦ÍÅÊÓÔ×Ï ÓÔÁÔÉÓÔÉÞÎÉÈ ËÏÍÐÒÅÓÏÒ¦× PPM.
 
+%package dll
+Summary:	%{realname} - DLL library for Windows
+Summary(pl):	%{realname} - biblioteka DLL dla Windows
+Group:		Applications/Emulators
+
+%description dll
+%{realname} - DLL library for Windows.
+
+%description dll -l pl
+%{realname} - biblioteka DLL dla Windows.
+
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -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
+
 %{__make} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall \$(BIGFILES)"
 
-%install
-rm -rf $RPM_BUILD_ROOT
+rm -f libbz2.a libbz2.dll
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=$RPM_BUILD_ROOT%{arch}
+$AR cru libbzip2.a blocksort.o huffman.o crctable.o randtable.o compress.o decompress.o bzlib.o
+$RANLIB libbzip2.a
 
-install libbz2.dll $RPM_BUILD_ROOT%{arch}/bin
+%{__cc} --shared libbzip2.a blocksort.o huffman.o crctable.o randtable.o compress.o decompress.o bzlib.o -Wl,--enable-auto-image-base -o bzip2.dll -Wl,--out-implib,libbzip2.dll.a
 
 %if 0%{!?debug:1}
-%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{arch}/bin/*.dll
-%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{arch}/lib/*.a
+%{target}-strip *.dll
+%{target}-strip -g -R.comment -R.note *.a
 %endif
 
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
+install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+
+install *.h $RPM_BUILD_ROOT%{arch}/include
+install *.a $RPM_BUILD_ROOT%{arch}/lib
+install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}/bin/libbz2.dll
-%{arch}/lib/libbz2.a
-%{arch}/include/bzlib.h
+%{arch}/include/*
+%{arch}/lib/*
+
+%files dll
+%defattr(644,root,root,755)
+%{_datadir}/wine/windows/system/*
-- 
2.44.0