- updated to 4.2.1 (new soname); docs dropped upstream

Changed files:
    beecrypt-ac.patch -> 1.1
    beecrypt-ac_python.patch -> 1.3
    beecrypt-lib64_fix.patch -> 1.5
    beecrypt-opt.patch -> 1.6
    beecrypt.spec -> 1.71

diff --git a/beecrypt-ac.patch b/beecrypt-ac.patch
new file mode 100644 (file)
index 0000000..4e86f16
--- /dev/null
+++ b/beecrypt-ac.patch
@@ -0,0 +1,24 @@
+--- beecrypt-4.2.1/configure.ac.orig   2009-07-12 09:18:46.000000000 +0200
++++ beecrypt-4.2.1/configure.ac        2009-09-18 17:13:19.564614289 +0200
+@@ -30,7 +30,7 @@
+   ac_enable_debug=no
+   ])
+ 
+-AC_ARG_WITH(cpu,[  --with-cpu              optimize for specific cpu],[A
++AC_ARG_WITH(cpu,[  --with-cpu              optimize for specific cpu],[
+   if test "$ac_enable_expert_mode" = yes; then
+     AC_MSG_ERROR([--with-cpu cannot be used in conjunction with --enable-expert-mode])
+   fi
+--- beecrypt-4.2.1/java/Makefile.am.orig       2009-07-11 10:18:15.000000000 +0200
++++ beecrypt-4.2.1/java/Makefile.am    2009-09-18 21:06:07.360609261 +0200
+@@ -26,9 +26,7 @@
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
+-libaltdir=$(prefix)/lib@LIBALT@
+-
+-libalt_LTLIBRARIES = libbeecrypt_java.la
++lib_LTLIBRARIES = libbeecrypt_java.la
+ 
+ libbeecrypt_java_la_SOURCES = \
+ beecrypt_tools.c \

diff --git a/beecrypt-ac_python.patch b/beecrypt-ac_python.patch
index b277fc6f78157a31bfcf8682c87568808b35893d..40563d523c6f8013a01504aa3ea4cff6ddee1431 100644 (file)
--- a/beecrypt-ac_python.patch
+++ b/beecrypt-ac_python.patch
@@ -1,13 +1,11 @@
---- beecrypt-4.1.2/configure.ac.orig   2004-12-24 13:53:59.069561400 +0100
-+++ beecrypt-4.1.2/configure.ac        2004-12-24 14:00:29.781164208 +0100
-@@ -397,8 +397,8 @@
-       ac_cv_python_include="-I`python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`"
+--- beecrypt-4.2.1/configure.ac.orig   2009-09-18 17:22:53.408615127 +0200
++++ beecrypt-4.2.1/configure.ac        2009-09-18 17:43:48.912607585 +0200
+@@ -456,7 +456,7 @@
+       ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`"
      ])
      AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [
--      echo "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()" > conftest.py
--      ac_cv_python_libdir=`python conftest.py`
-+      echo "import sys; print sys.version[[:3]]" > conftest.py
-+      ac_cv_python_libdir="${libdir}/python`python conftest.py`/site-packages"
+-      ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'`
++      ac_cv_python_libdir="${libdir}/python`$PYTHON -c 'import sys; print sys.version[[:3]]'`/site-packages"
      ])
-   else
-     ac_with_python=no
+   fi
+ fi

diff --git a/beecrypt-lib64_fix.patch b/beecrypt-lib64_fix.patch
deleted file mode 100644 (file)
index c468c5d..0000000
--- a/beecrypt-lib64_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN beecrypt-4.1.0.org/configure.ac beecrypt-4.1.0/configure.ac
---- beecrypt-4.1.0.org/configure.ac    2004-11-17 20:05:37.000000000 +0100
-+++ beecrypt-4.1.0/configure.ac        2004-11-18 15:20:28.433531355 +0100
-@@ -601,7 +601,7 @@
- case $target_os in
- linux*)
-   case $bc_target_arch in
--  powerpc64 | s390x | x86_64)
-+  sparc64 | powerpc64 | s390x | x86_64)
-     bc_libalt="64"
-     ;;
-   esac

diff --git a/beecrypt-opt.patch b/beecrypt-opt.patch
deleted file mode 100644 (file)
index fb6a490..0000000
--- a/beecrypt-opt.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN beecrypt-4.1.0.org/acinclude.m4 beecrypt-4.1.0/acinclude.m4
---- beecrypt-4.1.0.org/acinclude.m4    2004-11-18 13:31:16.000000000 +0100
-+++ beecrypt-4.1.0/acinclude.m4        2004-11-18 15:18:11.817798072 +0100
-@@ -495,19 +495,19 @@
-         # -march=athlon64 degrades performance
-         ;;
-       athlon*)
--        CFLAGS="$CFLAGS -march=$bc_target_arch"
-+        CFLAGS="$CFLAGS -march=$bc_target_cpu"
-         ;;
-       i586)
--        CFLAGS="$CFLAGS -march=pentium"
-+        CFLAGS="$CFLAGS -march=$bc_target_cpu"
-         ;;
-       i686)
--        CFLAGS="$CFLAGS -march=pentiumpro"
-+        CFLAGS="$CFLAGS -march=$bc_target_cpu"
-         ;;
-       pentium*)
--        CFLAGS="$CFLAGS -march=$bc_target_arch"
-+        CFLAGS="$CFLAGS -march=$bc_target_cpu"
-         ;;
-       powerpc | powerpc64)
--        CFLAGS="$CFLAGS -mcpu=$bc_target_arch"
-+        CFLAGS="$CFLAGS -mcpu=$bc_target_cpu"
-         ;;
-       sparcv8)
-         CFLAGS="$CFLAGS -mv8"
-@@ -570,7 +570,7 @@
-     if test "$bc_cv_c_aggressive_opt" = yes; then
-       case $bc_target_cpu in
-       athlon*)
--        CXXFLAGS="$CXXFLAGS -mcpu=pentiumpro";
-+        CXXFLAGS="$CXXFLAGS -mcpu=$bc_target_cpu";
-         ;;
-       i586)
-         CXXFLAGS="$CXXFLAGS -mcpu=pentium"
-@@ -582,7 +582,7 @@
-         # no -mcpu=... option on ia64
-         ;;
-       pentium*)
--        CXXFLAGS="$CXXFLAGS -mcpu=$bc_target_arch"
-+        CXXFLAGS="$CXXFLAGS -mcpu=$bc_target_cpu"
-         ;;
-       esac
-       # Architecture-specific optimizations
-diff -urN beecrypt-4.1.0.org/configure.ac beecrypt-4.1.0/configure.ac
---- beecrypt-4.1.0.org/configure.ac    2004-11-17 20:05:37.000000000 +0100
-+++ beecrypt-4.1.0/configure.ac        2004-11-18 15:19:07.577852788 +0100
-@@ -489,7 +489,7 @@
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
-     ;;
-   athlon*)
--    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
-+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
-     CFLAGS="$CFLAGS -mmmx"
-     ;;
-   i386)
---- beecrypt-4.1.2/configure.ac.orig   2009-09-15 11:17:44.000000000 +0200
-+++ beecrypt-4.1.2/configure.ac        2009-09-15 11:49:24.000000000 +0200
-@@ -556,15 +556,12 @@
-     ;;
-   sparcv8)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8"
--    CFLAGS="$CFLAGS -Wa,-xarch=v8"
-     ;;
-   sparcv8plus*)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS"
--    CFLAGS="$CFLAGS -Wa,-xarch=v8plus"
-     ;;
-   sparcv9*)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
--    CFLAGS="$CFLAGS -Wa,-xarch=v9"
-     ;;
-   x86_64)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"

diff --git a/beecrypt.spec b/beecrypt.spec
index e16fa362b91d63015b0226960c4daa98928d63ac..a8d7d4c43000cf53a9c1718fe2ce127a10437265 100644 (file)
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -2,31 +2,26 @@
 # WARNING: despite unchanged SONAME, the RSA ABI (and API) has changed since 3.x!
 #
 # Conditional build:
-%bcond_without java    # build with Java support
+%bcond_without java            # build with Java support
 %bcond_with    javac           # use javac instead of gcj
 %bcond_without python          # don't build python module
-%bcond_without doc             # don't build documentation
 %bcond_without static_libs     # don't build static libraries
 #
 Summary:       The BeeCrypt Cryptography Library
 Summary(pl.UTF-8):     Biblioteka kryptograficzna BeeCrypt
 Name:          beecrypt
-Version:       4.1.2
-Release:       8
+Version:       4.2.1
+Release:       1
 Epoch:         2
-License:       LGPL
+License:       LGPL v2.1+
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz
-# Source0-md5: 820d26437843ab0a6a8a5151a73a657c
-Patch0:                %{name}-opt.patch
-Patch1:                %{name}-lib64_fix.patch
-Patch2:                %{name}-ac_python.patch
+Source0:       http://dl.sourceforge.net/project/beecrypt/beecrypt/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 8441c014170823f2dff97e33df55af1e
+Patch0:                %{name}-ac.patch
+Patch1:                %{name}-ac_python.patch
 URL:           http://sourceforge.net/projects/beecrypt/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-%if %{with doc}
-BuildRequires: doxygen
-%endif
 %if %{with java} && !%{with javac}
 %ifarch i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRequires: jdk
@@ -35,10 +30,6 @@ BuildRequires:       gcc-java
 BuildRequires: libgcj-devel
 %endif
 %endif
-%if %{with doc}
-BuildRequires: ghostscript
-BuildRequires: graphviz
-%endif
 %if %{with java} && %{with javac}
 BuildRequires: jdk
 %endif
@@ -49,16 +40,14 @@ BuildRequires:      python-modules
 BuildRequires: rpm-pythonprov
 %endif
 BuildRequires: rpmbuild(macros) >= 1.213
-%if %{with doc}
-BuildRequires: tetex-dvips
-BuildRequires: tetex-format-latex
-BuildRequires: tetex-latex-dstroke
-# note: this is incorrect place, it should be somewhere in tetex packages
-BuildRequires: tetex-metafont
-%endif
+Obsoletes:     beecrypt-doc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                specflags_alpha          -mno-explicit-relocs
+%define                specflags_alpha         -mno-explicit-relocs
+%define                specflags_pentium2      -mmmx
+%define                specflags_pentium3      -mmmx -msse
+%define                specflags_pentium4      -mmmx -msse -msse2
+%define                specflags_athlon        -mmmx
 
 %description
 BeeCrypt is an open source cryptography library that contains highly
@@ -95,17 +84,6 @@ The BeeCrypt Cryptography Library - static library.
 %description static -l pl.UTF-8
 Biblioteka statyczna BeeCrypt.
 
-%package doc
-Summary:       Development documentation for BeeCrypt
-Summary(pl.UTF-8):     Dokumentacja programisty dla biblioteki BeeCrypt
-Group:         Documentation
-
-%description doc
-Development documentation for BeeCrypt.
-
-%description doc -l pl.UTF-8
-Dokumentacja programisty dla biblioteki BeeCrypt.
-
 %package java
 Summary:       BeeCrypt Java glue library
 Summary(pl.UTF-8):     Biblioteka łącząca BeeCrypt z Javą
@@ -164,13 +142,10 @@ bibliotekę BeeCrytp.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # --with-cplusplus or building (even empty) *.cxx into libbeecrypt
 # makes it (and thus rpm) depending on libstdc++ which is unacceptable
 %{__perl} -pi -e 's/ cppglue\.cxx$//' Makefile.am
-# only html docs
-%{__perl} -pi -e 's/^GENERATE_LATEX .*/GENERATE_LATEX = NO/' Doxyfile.in
 
 %build
 %{__libtoolize}
@@ -180,26 +155,12 @@ bibliotekę BeeCrytp.
 %{__automake}
 %configure \
        %{?with_javac:ac_cv_have_gcj=no} \
+       %{!?with_static_libs:--disable-static} \
        --without-cplusplus \
        --with%{!?with_java:out}-java \
-       --with-cpu=%{_target_cpu} \
-       %{!?with_static_libs:--enable-static=no} \
-%ifarch %{x8664}
-       --with-arch=x86_64 \
-%else
-       --with-arch=%{_target_cpu} \
-%endif
-       --with-pic \
-       --with%{!?with_python:out}-python
-%{__make}
+       %{!?with_python:--without-python}
 
-%if %{with python}
-%{__make} -C python
-%endif
-
-%if %{with doc}
-doxygen
-%endif
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -208,16 +169,11 @@ install -d $RPM_BUILD_ROOT/%{_lib}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with python}
-%{__make} install -C python \
-       DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-mv -f $RPM_BUILD_ROOT%{_libdir}/libbeecrypt.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libbeecrypt.so.*.*.*) \
+mv -f $RPM_BUILD_ROOT%{_libdir}/libbeecrypt.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libbeecrypt.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libbeecrypt.so
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -232,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BENCHMARKS BUGS CONTRIBUTORS NEWS README
 %attr(755,root,root) /%{_lib}/libbeecrypt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbeecrypt.so.6
+%attr(755,root,root) %ghost /%{_lib}/libbeecrypt.so.7
 
 %files devel
 %defattr(644,root,root,755)
@@ -250,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbeecrypt_java.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbeecrypt_java.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbeecrypt_java.so.7
 
 %files java-devel
 %defattr(644,root,root,755)
@@ -264,14 +220,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
-%if %{with doc}
-%files doc
-%defattr(644,root,root,755)
-%doc docs/html
-%endif
-
 %if %{with python}
 %files -n python-beecrypt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/_bc.so
 %endif