SPECS: crossmingw32-libvorbis.spec - updated to 1.2.0 (fixes CVE-2...

Sun Aug 5 20:01:51 CEST 2007

Author: qboosh                       Date: Sun Aug  5 18:01:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.2.0 (fixes CVE-2007-3106 CVE-2007-4029)
- added libtool patch, unified build, added -static

---- Files affected:
SPECS:
   crossmingw32-libvorbis.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libvorbis.spec
diff -u SPECS/crossmingw32-libvorbis.spec:1.3 SPECS/crossmingw32-libvorbis.spec:1.4

--- SPECS/crossmingw32-libvorbis.spec:1.3	Mon Feb 12 23:09:09 2007
+++ SPECS/crossmingw32-libvorbis.spec	Sun Aug  5 20:01:46 2007
@@ -3,14 +3,15 @@
 Summary:	The Vorbis General Audio Compression Codec - Mingw32 cross version
 Summary(pl.UTF-8):	Kodek kompresji audio - Vorbis - wersja skrośna dla Mingw32
 Name:		crossmingw32-%{realname}
-Version:	1.1.2
+Version:	1.2.0
 Release:	1
 License:	BSD
 Group:		Libraries
-Source0:	http://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.gz
-# Source0-md5:	37847626b8e1b53ae79a34714c7b3211
+Source0:	http://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.bz2
+# Source0-md5:	7c6e409d7aa1fa8a5481dea571d5bde0
 Patch0:		%{realname}-ac_fixes.patch
 Patch1:		%{realname}-make.patch
+Patch2:		%{name}-libtool.patch
 URL:		http://www.vorbis.com/
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-libogg
@@ -22,14 +23,16 @@
 
 %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		__cc		%{target}-gcc
-%define		__cxx		%{target}-g++
+%define		target			i386-mingw32
+%define		target_platform		%{target}
+%define		arch			%{_prefix}/%{target}
+
+%define		_sysprefix		/usr
+%define		_prefix			%{_sysprefix}/%{target}
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
+%define		__cc			%{target}-gcc
+%define		__cxx			%{target}-g++
 
 %ifarch alpha sparc sparc64 sparcv9
 %define		optflags	-O2
@@ -40,106 +43,104 @@
 general-purpose compressed audio format for audio and music at fixed
 and variable bitrates from 16 to 128 kbps/channel.
 
+This package contains the cross version for Win32.
+
 %description -l pl.UTF-8
 Ogg Vorbis jest całkowicie otwartym, nie będącym niczyją własnością,
 wolnym od patentów, ogólnego przeznaczenia kodekiem audio i muzyki o
 stałej i zmiennej bitrate od 16 do 128 kbps/kanał.
 
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:	Static libvorbis library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka libvorbis (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static libvorbis library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libvorbis (wersja skrośna mingw32).
+
 %package dll
-Summary:	%{realname} - DLL library for Windows
-Summary(pl.UTF-8):	%{realname} - biblioteka DLL dla Windows
+Summary:	DLL libvorbis library for Windows
+Summary(pl.UTF-8):	Biblioteka DLL libvorbis dla Windows
 Group:		Applications/Emulators
+Requires:	crossmingw32-libogg-dll
+Requires:	wine
 
 %description dll
-%{realname} - DLL library for Windows.
+DLL libvorbis library for Windows.
 
 %description dll -l pl.UTF-8
-%{realname} - biblioteka DLL dla Windows.
+Biblioteka DLL libvorbis dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -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
-
+export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--host=%{_host} \
+	OBJDUMP=%{target}-objdump \
+	--host=%{target} \
 	--target=%{target}
 
-for i in mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c analysis.c synthesis.c psy.c info.c floor1.c floor0.c \
-	res0.c mapping0.c registry.c codebook.c sharedbook.c lookup.c bitrate.c
-do
-	%{__cc} %{rpmcflags} -c lib/$i -Iinclude
-done
-
-rm -f libvorbis.a
-$AR cru libvorbis.a *.o
-$RANLIB libvorbis.a
-
-%{__cc} --shared *.o -Wl,--enable-auto-image-base -o vorbis.dll -Wl,--out-implib,libvorbis.dll.a `pkg-config --libs i386-mingw32-ogg`
-
-
-%{__cc} %{rpmcflags} -c lib/vorbisenc.c -Iinclude -Ilib
-%{__cc} %{rpmcflags} -c lib/vorbisfile.c -Iinclude
+%{__make}
 
-rm -f libvorbisenc.a
-$AR cru libvorbisenc.a vorbisenc.o
-$RANLIB libvorbisenc.a
-
-%{__cc} --shared vorbisenc.o -Wl,--enable-auto-image-base -o vorbisenc.dll -Wl,--out-implib,libvorbisenc.dll.a -lvorbis -L.
+%install
+rm -rf $RPM_BUILD_ROOT
 
-rm -f libvorbisfile.a
-$AR cru libvorbisfile.a vorbisfile.o
-$RANLIB libvorbisfile.a
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%{__cc} --shared vorbisfile.o -Wl,--enable-auto-image-base -o vorbisfile.dll -Wl,--out-implib,libvorbisfile.dll.a `pkg-config --libs i386-mingw32-ogg` -lvorbis -L.
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
-%{target}-strip *.dll
-%{target}-strip -g -R.comment -R.note *.a
+%{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
 
-sed -i	-e 's at libdir=/usr/lib at libdir=%{arch}/lib@' \
-	-e 's at includedir=/usr/include at includedir=%{arch}/include@' \
-	vorbis.pc vorbisenc.pc vorbisfile.pc
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include/vorbis,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-
-install include/vorbis/*.h $RPM_BUILD_ROOT%{arch}/include/vorbis
-install libvorbis*.a $RPM_BUILD_ROOT%{arch}/lib
-install vorbis*.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-
-install vorbis.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/i386-mingw32-vorbis.pc
-install vorbisenc.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/i386-mingw32-vorbisenc.pc
-install vorbisfile.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/i386-mingw32-vorbisfile.pc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}/include/vorbis
-%{arch}/lib/*
-%{_pkgconfigdir}/*
+%doc AUTHORS CHANGES COPYING README
+%{_libdir}/libvorbis.dll.a
+%{_libdir}/libvorbisenc.dll.a
+%{_libdir}/libvorbisfile.dll.a
+%{_libdir}/libvorbis.la
+%{_libdir}/libvorbisenc.la
+%{_libdir}/libvorbisfile.la
+%{_includedir}/vorbis
+%{_pkgconfigdir}/vorbis.pc
+%{_pkgconfigdir}/vorbisenc.pc
+%{_pkgconfigdir}/vorbisfile.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libvorbis.a
+%{_libdir}/libvorbisenc.a
+%{_libdir}/libvorbisfile.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*
+%{_dlldir}/libvorbis-*.dll
+%{_dlldir}/libvorbisenc-*.dll
+%{_dlldir}/libvorbisfile-*.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -147,6 +148,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007/08/05 18:01:46  qboosh
+- updated to 1.2.0 (fixes CVE-2007-3106 CVE-2007-4029)
+- added libtool patch, unified build, added -static
+
 Revision 1.3  2007/02/12 22:09:09  glen
 - tabs in preamble
 
@@ -155,4 +160,3 @@
 
 Revision 1.1  2006/05/28 15:18:33  wolf
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-libvorbis.spec?r1=1.3&r2=1.4&f=u

