- merged from DEVEL, updated to 1.1.4

[packages/dosemu.git] / dosemu.spec

diff --git a/dosemu.spec b/dosemu.spec
index 1c2ce1e963eadee4fbd62abbe01c943a490e8246..68b9fac3508de66a50625f695ce171e324938b47 100644 (file)
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -1,5 +1,6 @@
+#
 # Conditional build:
-# --with static                - linked static
+# _with_static         - linked static
 #
 Summary:       A DOS emulator
 Summary(de):   DOS-Emulator
@@ -9,8 +10,8 @@ Summary(pl):   Emulator DOSa
 Summary(pt_BR):        Emulador DOS
 Summary(tr):   DOS öykünümcüsü
 Name:          dosemu
-Version:       1.0.2
-Release:       19
+Version:       1.1.4
+Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/dosemu/%{name}-%{version}.tgz
@@ -19,33 +20,30 @@ Source2:    %{name}-sys.tar.gz
 Source3:       %{name}-PRZECZYTAJ_TO
 Source4:       %{name}-README.PLD
 Source5:       %{name}.desktop
-Patch0:                ftp://ftp.sourceforge.net/pub/sourceforge/dosemu/patch-1.0.2.1.gz
-Patch1:                %{name}-1.0.2-man-pages.patch
-Patch2:                %{name}-0.98.1-security.patch
-Patch3:                %{name}-make-new.patch
-Patch4:                %{name}-Polish_keyboard.patch
-Patch5:                %{name}-%{name}_conf.patch
-Patch6:                %{name}-alt224.patch
-Patch7:                pmstack.diff
-Patch8:                %{name}-rawkeyboard-console.patch
-Patch9:                %{name}-comcom.patch
-Patch10:       %{name}-global.conf-xdos.patch
-Patch11:       c_run_irqs.diff
+#Source6:      http://www.dosemu.org/~stas/patchset-%{version}.%{pver}.tgz
+Patch0:                %{name}-man-pages.patch
+Patch1:                %{name}-parser-buf.patch
+Patch2:                %{name}-make-new.patch
+Patch3:                %{name}-%{name}_conf.patch
+Patch4:                %{name}-mfs-pts.patch
+Patch5:                %{name}-Oacute.patch
+Patch6:                %{name}-doSgmlTools.patch
+Patch7:                %{name}-dont_build_dvi.patch
 URL:           http://www.dosemu.org/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: bin86
 BuildRequires: bison
-#BuildRequires:        docbook-dtd-sgml
+BuildRequires: docbook-dtd30-sgml
 BuildRequires: flex
-#BuildRequires:        lynx
-#BuildRequires:        openjade
+BuildRequires: lynx
+BuildRequires: openjade
 BuildRequires: perl
-#BuildRequires:        sgml-tools
+BuildRequires: sgml-tools
 BuildRequires: slang-devel
 BuildRequires: util-linux
 BuildRequires: unzip
-#Requires:     dos
+Requires:      dos
 %{?_with_static:BuildRequires: glibc-static}
 %{?_with_static:BuildRequires: XFree86-static}
 %{?_with_static:BuildRequires: slang-static}
@@ -95,7 +93,7 @@ Summary(tr):  X alt
 Group:         Applications/Emulators
 Provides:      dosemu
 Obsoletes:     dosemu
-#Requires:     dos
+Requires:      dos
 
 %description -n xdosemu
 Xdosemu is a version of the dosemu DOS emulator that runs with the X
@@ -145,19 +143,15 @@ mkfatimage16.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
-%patch6 -p1
-%patch7 -p0
-%patch8 -p0
-%patch9 -p1
-%patch10 -p1
-%patch11 -p0
+%patch5 -p1
+%patch6        -p1
+%patch7 -p1
 
 %build
 OPTFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"; export OPTFLAGS
 
-#./mkpluginhooks enable plugin_keyboard off plugin_kbd_unicode on \
-#plugin_extra_charset on plugin_term on plugin_translate on plugin_demo off
+./mkpluginhooks enable plugin_keyboard off plugin_kbd_unicode on \
+plugin_extra_charset on plugin_term on plugin_translate on plugin_demo off
 
 cp -f base-configure.in configure.in
 %{__autoconf}
@@ -184,11 +178,11 @@ mv -f bin/dos-nox bin/dosemu.bin
 mv -f man/dosemu.bin.1 man/dos.1
 
 # documentation
-#%{__make} docs
-#find src/doc -name "*.html" -exec cp -f '{}' doc/ ';'
+%{__make} docs
+find src/doc -name "*.html" -exec cp -f '{}' doc/ ';'
 
 # midid daemon
-%{__make} midid
+#%{__make} midid
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -206,7 +200,7 @@ install bin/dosdebug $RPM_BUILD_ROOT%{_bindir}/dosdebug
 install src/tools/periph/{dexeconfig,hdinfo,mkhdimage,mkfatimage16} $RPM_BUILD_ROOT%{_bindir}
 ln -sf dos $RPM_BUILD_ROOT%{_bindir}/dosexec
 
-install etc/dosemu.xpm $RPM_BUILD_ROOT%{_prefix}/X11R6/share/pixmaps
+install etc/dosemu.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 install etc/dosemu.users.secure $RPM_BUILD_ROOT%{_sysconfdir}/dosemu.users
 install etc/global.conf $RPM_BUILD_ROOT%{_dosemudir}/global.conf
 install etc/dosemu.conf $RPM_BUILD_ROOT%{_sysconfdir}/dosemu.conf
@@ -218,13 +212,10 @@ install src/plugin/commands/*.com $RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
 install dosemu/*.sys $RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
 cp %{SOURCE3} PRZECZYTAJ_TO
 cp %{SOURCE4} README.PLD
-install %{SOURCE5} $RPM_BUILD_ROOT%{_applnkdir}/System/
+install %{SOURCE5} $RPM_BUILD_ROOT%{_applnkdir}/System
 
 #ln -sf dosemu/comcom.com $RPM_BUILD_ROOT%{_dosemudir}/bootdir/command.com
 
-# Take out irritating ^H's from the documentation
-for i in `ls --color=no doc/` ; do cat doc/$i > $i ; cat $i | perl -p -e 's/.\010//g' > doc/$i ; done
-
 rm -f doc/{configuration,dosemu.lsm}
 
 %clean
@@ -232,7 +223,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc QuickStart COPYING ChangeLog* doc/* PRZECZYTAJ_TO README.PLD
+%doc QuickStart COPYING ChangeLog* doc/*.html PRZECZYTAJ_TO README.PLD
 %dir %{_dosemudir}
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.users
@@ -251,7 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n xdosemu
 %defattr(644,root,root,755)
-%doc QuickStart COPYING ChangeLog* doc/* PRZECZYTAJ_TO README.PLD
+%doc QuickStart COPYING ChangeLog* doc/*.html PRZECZYTAJ_TO README.PLD
 %dir %{_dosemudir}
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.users