- updated to 1.3.3.1 svn, AC bcond

Changed files:
    dosemu.spec -> 1.120

diff --git a/dosemu.spec b/dosemu.spec
index 3b0644c6e8cc70414982b684609b3645febdd3dd..2c1875d9ab001004a285b2f4737715b8745ad1d3 100644 (file)
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_with    static          # link statically
+%bcond_with    AC
 %bcond_without x               # X support
 #
 Summary:       A DOS emulator
@@ -12,11 +13,11 @@ Summary(pl):        Emulator DOS-a
 Summary(pt_BR):        Emulador DOS
 Summary(tr):   DOS öykünümcüsü
 Name:          dosemu
-Version:       1.3.3
-Release:       1
+Version:       1.3.3.1
+Release:       0.svn.1
 License:       GPL v2
 Group:         Applications/Emulators
-Source0:       http://dl.sourceforge.net/dosemu/%{name}-%{version}.tgz
+Source0:       http://dl.sourceforge.net/dosemu/%{name}-1.3.3.tgz
 # Source0-md5: f3b27a9326e5c95e59093fcb79a61023
 #Source2:      %{name}-sys.tar.gz
 Source3:       %{name}-PRZECZYTAJ_TO
@@ -29,11 +30,18 @@ Patch1:             %{name}-make-new.patch
 Patch2:                %{name}-%{name}_conf.patch
 Patch3:                %{name}-doSgmlTools.patch
 Patch4:                %{name}-makehtml.patch
+Patch5:                %{name}-1.3.3.1svn.patch.gz
 URL:           http://www.dosemu.org/
 BuildRequires: SDL-devel
 %if %{with x}
-BuildRequires: XFree86-devel
-%{?with_static:BuildRequires:  XFree86-static}
+%if %{without AC}
+BuildRequires: xorg-lib-libX11-devel
+%{?with_static:BuildRequires:  xorg-lib-libX11-static}
+%endif
+%if %{with AC}
+BuildRequires: X11-devel
+%{?with_static:BuildRequires:  X11-static}
+%endif
 %endif
 BuildRequires: autoconf >= 2.57
 BuildRequires: bin86
@@ -120,13 +128,14 @@ X plugin for dosemu.
 Wtyczka X dla dosemu.
 
 %prep
-%setup -q -a6
+%setup -q -a6 -n %{name}-1.3.3
 #sh tmp/do_patch
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
@@ -187,7 +196,7 @@ ln -sf dosemu $RPM_BUILD_ROOT%{_bindir}/xdosexec
 install bin/libplugin*.so  $RPM_BUILD_ROOT%{_libdir}/dosemu
 
 install bin/dosdebug $RPM_BUILD_ROOT%{_bindir}/dosdebug
-install src/tools/periph/{dexeconfig,hdinfo,mkhdimage,mkfatimage16} $RPM_BUILD_ROOT%{_bindir}
+install src/tools/periph/{dexeconfig,hdinfo,mkhdimage} $RPM_BUILD_ROOT%{_bindir}
 ln -sf dos $RPM_BUILD_ROOT%{_bindir}/dosexec
 
 install etc/dosemu.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -246,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dexeconfig
 %attr(755,root,root) %{_bindir}/hdinfo
 %attr(755,root,root) %{_bindir}/mkhdimage
-%attr(755,root,root) %{_bindir}/mkfatimage16
+#%attr(755,root,root) %{_bindir}/mkfatimage16
 %{_mandir}/man1/mkfatimage16.1*
 %lang(ru) %{_mandir}/ru/man1/mkfatimage16.1*