- pass CPU tuning to configure scripts, added opt patch to better exploit

  athlon (I'm not sure if -O3 forced by configure is the best option...
  but decided not to remove without checking)
- removed win32-specific READMEs, added BENCHMARKING

Changed files:
    beecrypt-opt.patch -> 1.1
    beecrypt.spec -> 1.12

diff --git a/beecrypt-opt.patch b/beecrypt-opt.patch
new file mode 100644 (file)
index 0000000..0d20262
--- /dev/null
+++ b/beecrypt-opt.patch
@@ -0,0 +1,22 @@
+--- beecrypt-3.0.0pre/configure.ac.orig        2003-05-15 15:31:14.000000000 +0200
++++ beecrypt-3.0.0pre/configure.ac     2003-05-19 21:21:01.000000000 +0200
+@@ -557,7 +557,7 @@
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
+     ;;
+   athlon*)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+     ;;
+   i386)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
+--- beecrypt-3.0.0pre/acinclude.m4.orig        2003-05-15 15:31:14.000000000 +0200
++++ beecrypt-3.0.0pre/acinclude.m4     2003-05-19 21:20:49.000000000 +0200
+@@ -282,7 +282,7 @@
+     CFLAGS="$CFLAGS -O3 -fomit-frame-pointer"
+     case $bc_target_cpu in
+     athlon*)
+-      CFLAGS="$CFLAGS -mcpu=pentiumpro";
++      CFLAGS="$CFLAGS -mcpu=$bc_target_cpu";
+       ;;
+     i586)
+       CFLAGS="$CFLAGS -mcpu=pentium"

diff --git a/beecrypt.spec b/beecrypt.spec
index 9bb20a8869c73fd08a611fab59478c8c66896e45..a477cf27890e4bf79232254e63553ae1af1ad9c7 100644 (file)
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -1,4 +1,7 @@
+#
+# Conditional build:
 # _with_javaglue
+#
 %define                snap 20030516
 Summary:       The BeeCrypt Cryptography Library
 Summary(pl):   Biblioteka kryptograficzna BeeCrypt
@@ -7,10 +10,14 @@ Version:     3.0.0
 Release:       0.%{snap}.1
 Epoch:         2
 License:       LGPL
-Group:         Development/Libraries
+Group:         Libraries
 Source0:       http://dl.sf.net/%{name}/%{name}-%{version}pre.%{snap}.tar.gz
 Patch0:                %{name}-from_rpm.patch
+Patch1:                %{name}-opt.patch
 URL:           http://sourceforge.net/projects/beecrypt/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,6 +58,7 @@ Biblioteka statyczna BeeCrypt.
 %prep
 %setup  -q -n %{name}-%{version}pre
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
@@ -60,7 +68,9 @@ rm -f missing
 %{__autoheader}
 %{__automake}
 %configure \
-       --with%{?!_with_javaglue:out}-javaglue
+       --with%{?!_with_javaglue:out}-javaglue \
+       --with-cpu=%{_target_cpu} \
+       --with-arch=%{_target_cpu}
 %{__make}
 
 %install
@@ -71,12 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc README* CONTRIBUTORS AUTHORS BUGS NEWS 
+%doc AUTHORS BENCHMARKS BUGS CONTRIBUTORS NEWS README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel