- updated to 1.3.4

[packages/crossmingw32-libvorbis.git] / crossmingw32-libvorbis.spec

diff --git a/crossmingw32-libvorbis.spec b/crossmingw32-libvorbis.spec
index 5045844f5fd3e8101c54330294a30fe24aa1280e..f28e11e8581f3d38b65610749be669221bae11f0 100644 (file)
--- a/crossmingw32-libvorbis.spec
+++ b/crossmingw32-libvorbis.spec
@@ -1,22 +1,27 @@
 %define                realname        libvorbis
-Summary:       The Vorbis General Audio Compression Codec - Mingw32 cross version
-Summary(pl.UTF-8):     Kodek kompresji audio - Vorbis - wersja skrośna dla Mingw32
+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.2.0
+Version:       1.3.4
 Release:       1
 License:       BSD
-Group:         Libraries
-Source0:       http://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.bz2
-# Source0-md5: 7c6e409d7aa1fa8a5481dea571d5bde0
+Group:         Development/Libraries
+Source0:       http://downloads.xiph.org/releases/vorbis/%{realname}-%{version}.tar.xz
+# Source0-md5: 55f2288055e44754275a17c9a2497391
 Patch0:                %{realname}-ac_fixes.patch
 Patch1:                %{realname}-make.patch
-Patch2:                %{name}-libtool.patch
 URL:           http://www.vorbis.com/
-BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-libogg
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.6
+BuildRequires: crossmingw32-gcc >= 3.0
+BuildRequires: crossmingw32-libogg >= 1.0
 BuildRequires: crossmingw32-w32api
+BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.15
-Requires:      crossmingw32-libogg
+BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires:      crossmingw32-libogg >= 1.0
 Requires:      crossmingw32-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,14 +32,19 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %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
+%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, most of -f options are Linux-specific
+%define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
@@ -51,22 +61,22 @@ 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)
+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).
+Static libvorbis library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka libvorbis (wersja skrośna mingw32).
+Statyczna biblioteka libvorbis (wersja skrośna MinGW32).
 
 %package dll
 Summary:       DLL libvorbis library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL libvorbis dla Windows
 Group:         Applications/Emulators
-Requires:      crossmingw32-libogg-dll
+Requires:      crossmingw32-libogg-dll >= 1.0
 Requires:      wine
 
 %description dll
@@ -79,12 +89,12 @@ Biblioteka DLL libvorbis dla Windows.
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%{__sed} -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -109,7 +119,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT