- separate bcond for SDL (SDL doesn't always imply X)

Changed files:
    dosemu.spec -> 1.147

diff --git a/dosemu.spec b/dosemu.spec
index 3555a2e0c6b7ea240f079d29a4d6461927a19347..f75b5b5748ce2e4fdab154a7e571481a8de19227 100644 (file)
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -4,6 +4,7 @@
 %bcond_with    static          # link statically
 %bcond_with    AC
 %bcond_without htmldocs        # do not build documentation in HTML
+%bcond_without sdl             # SDL support
 %bcond_without x               # X support
 %bcond_with    samba           # samba support
 #
@@ -42,6 +43,7 @@ Patch7:               %{name}-lpt4.patch
 Patch8:                %{name}-Xquit.patch
 Patch9:                %{name}-creat_mode.patch
 URL:           http://www.dosemu.org/
+%{?with_sdl:BuildRequires:     SDL-devel}
 BuildRequires: alsa-lib-devel >= 0.9
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: bin86
@@ -62,7 +64,6 @@ BuildRequires:        slang-devel
 BuildRequires: unzip
 BuildRequires: util-linux
 %if %{with x}
-BuildRequires: SDL-devel
 %if !%{with AC}
 BuildRequires: xorg-app-bdftopcf
 BuildRequires: xorg-app-mkfontdir
@@ -289,11 +290,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/mkfatimage16.1*
 %lang(ru) %{_mandir}/ru/man1/mkfatimage16.1*
 
-%if %{with x}
+%if %{with sdl}
 %files SDL
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dosemu/libplugin_sdl.so
+%endif
 
+%if %{with x}
 %files X
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dosemu/libplugin_X.so