- disable asm on x86_64 because of relocation problems

[packages/libdv.git] / libdv.spec

diff --git a/libdv.spec b/libdv.spec
index 2a2ff5831031c2bbe057fa1fdf6b9350166b1969..49d1508f8e417775d3df269a9c039b0611146319 100644 (file)
--- a/libdv.spec
+++ b/libdv.spec
@@ -1,29 +1,33 @@
 #
 # Conditional build:
 %bcond_without gui     # don't build gui stuff
-%bcond_with    mmx             # use MMX asm (won't run on non-MMX CPU!)
+%bcond_with    mmx     # use MMX asm (won't run on non-MMX CPU!)
+%bcond_without static_libs     # don't build static library
 #
 %ifarch athlon pentium3 pentium4
+# %{x8664} skipped - gas generates PIC-incompatible relocation entries
 %define                with_mmx        1
 %endif
 Summary:       DV video software codec
 Summary(pl):   Biblioteka do obs³ugi formatu wideo DV
 Name:          libdv
-Version:       0.103
+Version:       0.104
 Release:       2
 License:       LGPL
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/libdv/%{name}-%{version}.tar.gz
-# Source0-md5: b5c7d0db672a76528e100828dd866a79
+# Source0-md5: f6b08efce7472daa20685e6e8431f542
 Patch0:                %{name}-include_fix.patch
 URL:           http://libdv.sourceforge.net/
 %if %{with gui}
-BuildRequires: SDL-devel
+BuildRequires: SDL-devel >= 1.1.6
 BuildRequires: XFree86-devel
 BuildRequires: gtk+-devel >= 1.2.10-3
 %endif
-BuildRequires: pkgconfig >= 0.7
+BuildRequires: automake
+BuildRequires: pkgconfig >= 1:0.7
 BuildRequires: popt-devel
+BuildRequires: rpmbuild(macros) >= 1.213
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,17 +86,19 @@ Statyczna wersja biblioteki libdv.
 %patch0 -p1
 
 %build
+cp /usr/share/automake/config.sub .
 %configure \
        --enable-shared \
 %if %{with gui}
        --enable-sdl \
        --enable-gtk \
 %else
-    --disable-sdl \
-    --disable-gtk \
+       --disable-sdl \
+       --disable-gtk \
 %endif
        --without-debug \
-       %{!?with_mmx:--disable-asm}
+       %{!?with_mmx:--disable-asm} \
+       %{!?with_static_libs:--disable-static}
 
 %{__make}
 
@@ -128,6 +134,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libdv
 %{_pkgconfigdir}/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif