Author: qboosh                       Date: Sat Jan 12 00:55:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use yasm on x86_64; cleanup

---- Files affected:
SPECS:
   e3.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/e3.spec
diff -u SPECS/e3.spec:1.39 SPECS/e3.spec:1.40
--- SPECS/e3.spec:1.39  Tue Oct 16 19:52:25 2007
+++ SPECS/e3.spec       Sat Jan 12 01:55:02 2008
@@ -5,7 +5,7 @@
 Version:       2.7.0
 Release:       1
 Epoch:         1
-License:       GPL
+License:       GPL v2
 Group:         Applications/Editors
 Source0:       http://www.sax.de/~adlibit/%{name}-%{version}.tar.gz
 # Source0-md5: a76dd61c52a80a1f4d3938a4ce54c62e
@@ -16,10 +16,12 @@
 BuildRequires: nasm
 %endif
 BuildRequires: perl-base
+%ifarch %{x8664}
+BuildRequires: yasm
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                no_install_post_strip 1
-#%%define              _use_internal_dependency_generator 0
+%define                no_install_post_strip   1
 
 %description
 e3 is a text micro editor with a code size less than 10000 bytes.
@@ -44,20 +46,20 @@
 %setup -q
 %patch0 -p1
 
-# gzexe makes problems
-# we gain 3K only
-perl -pi -e 's/^.*gzexe e3.*$//' Makefile
-
 %build
 %ifarch %{ix86}
 %{__make}
 %endif
+%ifarch %{x8664}
+%{__make} yasm64 \
+       AFLAGS=-
+%endif
 %{__cc} %{rpmcflags} %{rpmldflags} -DLIBDIR=\"%{_libdir}\" e3c/e3.c -o e3c.bin
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}}
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
 install e3 $RPM_BUILD_ROOT%{_bindir}/e3
 %else
 ln -sf e3c $RPM_BUILD_ROOT%{_bindir}/e3
@@ -84,9 +86,9 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%doc ChangeLog README
-%{_mandir}/man1/*
+%doc COPYRIGHT ChangeLog README
+%attr(755,root,root) %{_bindir}/e3*
+%{_mandir}/man1/e3*.1*
 %{_libdir}/*.hlp
 %{_libdir}/*.res
 
@@ -96,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2008-01-12 00:55:02  qboosh
+- use yasm on x86_64; cleanup
+
 Revision 1.39  2007-10-16 17:52:25  witekfl
 - updated to 2.7.0
 - epoch 1
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e3.spec?r1=1.39&r2=1.40&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to