- BOOT -> embed

- rel 4

Changed files:
    e3.spec -> 1.19

diff --git a/e3.spec b/e3.spec
index 332fea2f0eba500d7ff94e573c65475c9570b688..bf943742c6352b58a274bb49cf3dcd7d918b325f 100644 (file)
--- a/e3.spec
+++ b/e3.spec
@@ -2,7 +2,7 @@ Summary:        Tiny editor
 Summary(pl):   Mikroedytorek
 Name:          e3
 Version:       1.61
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/Editors
 Group(de):     Applikationen/Editors
@@ -13,11 +13,20 @@ Source1:    %{name}-editor.sh
 Patch0:                %{name}-short_jump.patch
 Patch1:                %{name}-%{version}-Polish_letters.patch
 URL:           http://www.sax.de/~adlibit/
+BuildRequires: perl
+%ifarch %{ix86}
 BuildRequires: nasm
-ExclusiveArch: %{ix86}
+%endif
+BuildRequires: uClibc-devel
+BuildRequires: uClibc-static
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
 %define no_install_post_strip 1
 
+%define embed_path     /usr/lib/embed
+%define embed_cc       %{_arch}-uclibc-cc
+%define embed_cflags   %{rpmcflags} -Os
+
 %description
 e3 is a text micro editor with a code size less than 10000 bytes.
 Except for 'undo' and 'syntax highlighting', e3 supports all of the
@@ -37,14 +46,14 @@ wyra
 EMACSA, Pico, Nedit oraz vi. e3 nie jest zale¿ny od ¿adnej biblioteki
 (wliczaj±c glibc).
 
-%package BOOT
+%package embed
 Summary:       e3 for bootdisk
 Group:         Applications/Editors
 Group(de):     Applikationen/Editors
 Group(pl):     Aplikacje/Edytory
 Group(pt):     Aplicações/Editores
 
-%description BOOT
+%description embed
 e3 for bootdisk.
 
 %prep
@@ -56,25 +65,47 @@ e3 for bootdisk.
 perl -pi -e 's/^.*gzexe e3.*$//' Makefile
 
 %build
+%ifarch %{ix86}
 %{__make}
+%endif
+%{embed_cc} %{embed_cflags} -DLIBDIR=\"%{_libdir}\" e3c/e3.c -o e3c.shared
+%{embed_cc} %{embed_cflags} -DLIBDIR=\"%{_libdir}\" -static e3c/e3.c -o e3c.static
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT%{embed_path}/{static,shared,%{_libdir}} \
+       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}}
+
+%ifarch %{ix86}
+install e3 $RPM_BUILD_ROOT%{embed_path}/static/e3
+install e3 $RPM_BUILD_ROOT%{embed_path}/shared/e3
+install e3 $RPM_BUILD_ROOT%{_bindir}/e3
+%else
+ln -sf e3c $RPM_BUILD_ROOT%{embed_path}/static/e3
+ln -sf e3c $RPM_BUILD_ROOT%{embed_path}/shared/e3
+ln -sf e3c $RPM_BUILD_ROOT%{_bindir}/e3
+%endif
 
-install e3 $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin
-install e3 $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin/editor.sh
+install e3c.static $RPM_BUILD_ROOT%{embed_path}/static/e3c
+install e3c.shared $RPM_BUILD_ROOT%{embed_path}/shared/e3c
+install e3c.static $RPM_BUILD_ROOT%{_bindir}/e3c
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{embed_path}/shared/editor.sh
+install %{SOURCE1} $RPM_BUILD_ROOT%{embed_path}/static/editor.sh
 install e3.man $RPM_BUILD_ROOT%{_mandir}/man1/e3.1
+install e3c/e3c.man $RPM_BUILD_ROOT%{_mandir}/man1/e3c.1
+
+install e3c/*.{hlp,res} $RPM_BUILD_ROOT%{_libdir}
+install e3c/*.{hlp,res} $RPM_BUILD_ROOT%{embed_path}%{_libdir}
 
-for i in ws em pi vi ne; do \
-       ln -sf e3 $RPM_BUILD_ROOT%{_bindir}/e3${i}; \
-       ln -sf e3 $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin/e3${i}; \
+for i in ws em pi vi ne; do
+       ln -sf e3 $RPM_BUILD_ROOT%{_bindir}/e3${i}
+       ln -sf e3 $RPM_BUILD_ROOT%{embed_path}/static/e3${i}
+       ln -sf e3 $RPM_BUILD_ROOT%{embed_path}/shared/e3${i}
 done
 
-for i in emacs vi pico ne ws; do \
-       ln -sf editor.sh $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin/$i; \
+for i in emacs vi pico ne ws; do
+       ln -sf editor.sh $RPM_BUILD_ROOT%{embed_path}/static/$i
 done
 
 %clean
@@ -84,7 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
+%{embed_path}%{_libdir}/*
 
-%files BOOT
+%files embed
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/bootdisk/bin/*
+%attr(755,root,root) %{embed_path}/s*/*
+%{embed_path}%{_libdir}/*