SPECS: crossmingw32-bzip2.spec - updated to 1.0.5 (fixes CVE-2005-...

[qboosh]

Author: qboosh                       Date: Sat Mar 22 18:00:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.0.5 (fixes CVE-2005-1260 CVE-2008-1372)
- unified crossmingw32 spec style, added -static

---- Files affected:
SPECS:
   crossmingw32-bzip2.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-bzip2.spec
diff -u SPECS/crossmingw32-bzip2.spec:1.7 SPECS/crossmingw32-bzip2.spec:1.8
--- SPECS/crossmingw32-bzip2.spec:1.7	Mon Feb 12 22:23:51 2007
+++ SPECS/crossmingw32-bzip2.spec	Sat Mar 22 19:00:16 2008
@@ -8,14 +8,14 @@
 Summary(uk.UTF-8):	Компресор файлів на базі алгоритму блочного сортування
 Summary(ru.UTF-8):	Компрессор файлов на основе алгоритма блочной сортировки
 Name:		crossmingw32-%{realname}
-Version:	1.0.2
-Release:	2
+Version:	1.0.5
+Release:	1
 License:	BSD-like
 Group:		Applications/Archiving
-Source0:	ftp://sources.redhat.com/pub/bzip2/v102/%{realname}-%{version}.tar.gz
-# Source0-md5:	ee76864958d568677f03db8afad92beb
+Source0:	http://www.bzip.org/%{version}/%{realname}-%{version}.tar.gz
+# Source0-md5:	3c15a0c8d1d3ee1c46a1634d00617b1a
 Patch0:		%{name}.patch
-URL:		http://sources.redhat.com/bzip2/
+URL:		http://www.bzip.org/
 BuildRequires:	crossmingw32-gcc
 Requires:	crossmingw32-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -24,12 +24,16 @@
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
-%define		arch			%{_prefix}/%{target}
 
+%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
 
@@ -84,6 +88,18 @@
 розповсюджені компресори на базі LZ77/LZ78 і наближається до тої, що
 її забезпечує сімейство статистичних компресорів PPM.
 
+%package static
+Summary:	Static bzip2 library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka bzip2 (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static bzip2 library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka bzip2 (wersja skrośna mingw32).
+
 %package dll
 Summary:	%{realname} - DLL library for Windows
 Summary(pl.UTF-8):	%{realname} - biblioteka DLL dla Windows
@@ -100,18 +116,12 @@
 %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
+AR=%{target}-ar
+RANLIB=%{target}-ranlib
 
 %{__make} \
+	AR="$AR" \
+	RANLIB="$RANLIB" \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall \$(BIGFILES)"
 
@@ -122,31 +132,34 @@
 
 %{__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 *.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 -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_dlldir}}
 
-install *.h $RPM_BUILD_ROOT%{arch}/include
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+install *.h $RPM_BUILD_ROOT%{_includedir}
+install *.a $RPM_BUILD_ROOT%{_libdir}
+install *.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip $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/*
+%{_libdir}/libbzip2.dll.a
+%{_includedir}/bzlib*.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libbzip2.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*
+%{_dlldir}/bzip2.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -154,6 +167,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008-03-22 18:00:16  qboosh
+- updated to 1.0.5 (fixes CVE-2005-1260 CVE-2008-1372)
+- unified crossmingw32 spec style, added -static
+
 Revision 1.7  2007-02-12 21:23:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/crossmingw32-bzip2.spec?r1=1.7&r2=1.8&f=u