- added applnk icon from DEVEL and some (commented out) doc changes

- release 18, STBR for buildlog

Changed files:
    dosemu.spec -> 1.77

diff --git a/dosemu.spec b/dosemu.spec
index ac6e570c6495c23bd7faec5c31b0152e03ecfc25..223a2cbb324e0a8deb634a61c879ebf346757cdb 100644 (file)
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -10,7 +10,7 @@ Summary(pt_BR):       Emulador DOS
 Summary(tr):   DOS öykünümcüsü
 Name:          dosemu
 Version:       1.0.2
-Release:       17
+Release:       18
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/dosemu/%{name}-%{version}.tgz
@@ -18,12 +18,13 @@ Source1:    http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.t
 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
+Patch5:                %{name}-dosemu_conf.patch
 Patch6:                %{name}-alt224.patch
 Patch7:                pmstack.diff
 Patch8:                %{name}-rawkeyboard-console.patch
@@ -35,11 +36,15 @@ BuildRequires:      XFree86-devel
 BuildRequires: autoconf
 BuildRequires: bin86
 BuildRequires: bison
+#BuildRequires:        docbook-dtd-sgml
 BuildRequires: flex
+#BuildRequires:        lynx
+#BuildRequires:        openjade
 BuildRequires: perl
+#BuildRequires:        sgml-tools
 BuildRequires: slang-devel
 BuildRequires: unzip
-Requires:      dos
+#Requires:     dos
 %{?_with_static:BuildRequires: glibc-static}
 %{?_with_static:BuildRequires: XFree86-static}
 %{?_with_static:BuildRequires: slang-static}
@@ -88,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
@@ -149,6 +154,9 @@ mkfatimage16.
 %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
+
 cp -f base-configure.in configure.in
 %{__autoconf}
 
@@ -173,6 +181,10 @@ 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/ ';'
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_xbindir},%{_sysconfdir},%{_pixmapsdir}} \
@@ -199,6 +211,7 @@ 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/
 
 #ln -sf dosemu/comcom.com $RPM_BUILD_ROOT%{_dosemudir}/bootdir/command.com
 
@@ -245,6 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xdos.1*
 %lang(pl) %{_mandir}/pl/man1/d*
 %lang(pl) %{_mandir}/pl/man1/xdos.1*
+%{_applnkdir}/System/*
 %{_pixmapsdir}/dosemu.xpm
 
 %files utils