Author: qboosh Date: Fri Sep 18 20:07:20 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.2.1 (new soname); docs dropped upstream
---- Files affected:
packages/beecrypt:
beecrypt-ac_python.patch (1.2 -> 1.3) , beecrypt.spec (1.70 -> 1.71) ,
beecrypt-ac.patch (NONE -> 1.1) (NEW), beecrypt-lib64_fix.patch (1.4 -> NONE)
(REMOVED), beecrypt-opt.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/beecrypt/beecrypt-ac_python.patch
diff -u packages/beecrypt/beecrypt-ac_python.patch:1.2
packages/beecrypt/beecrypt-ac_python.patch:1.3
--- packages/beecrypt/beecrypt-ac_python.patch:1.2 Fri Dec 24 14:34:00 2004
+++ packages/beecrypt/beecrypt-ac_python.patch Fri Sep 18 22:07:14 2009
@@ -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
================================================================
Index: packages/beecrypt/beecrypt.spec
diff -u packages/beecrypt/beecrypt.spec:1.70
packages/beecrypt/beecrypt.spec:1.71
--- packages/beecrypt/beecrypt.spec:1.70 Tue Sep 15 12:36:11 2009
+++ packages/beecrypt/beecrypt.spec Fri Sep 18 22:07:14 2009
@@ -3,31 +3,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
@@ -36,10 +31,6 @@
BuildRequires: libgcj-devel
%endif
%endif
-%if %{with doc}
-BuildRequires: ghostscript
-BuildRequires: graphviz
-%endif
%if %{with java} && %{with javac}
BuildRequires: jdk
%endif
@@ -50,16 +41,14 @@
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
@@ -96,17 +85,6 @@
%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ą
@@ -165,13 +143,10 @@
%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}
@@ -181,26 +156,12 @@
%{__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}
-
-%if %{with python}
-%{__make} -C python
-%endif
+ %{!?with_python:--without-python}
-%if %{with doc}
-doxygen
-%endif
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -209,16 +170,11 @@
%{__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
@@ -233,7 +189,7 @@
%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)
@@ -251,7 +207,7 @@
%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)
@@ -265,16 +221,10 @@
%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
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -283,6 +233,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71 2009/09/18 20:07:14 qboosh
+- updated to 4.2.1 (new soname); docs dropped upstream
+
Revision 1.70 2009/09/15 10:36:11 tommat
- one more soname symlink
================================================================
Index: packages/beecrypt/beecrypt-ac.patch
diff -u /dev/null packages/beecrypt/beecrypt-ac.patch:1.1
--- /dev/null Fri Sep 18 22:07:20 2009
+++ packages/beecrypt/beecrypt-ac.patch Fri Sep 18 22:07:14 2009
@@ -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)/l...@libalt@
+-
+-libalt_LTLIBRARIES = libbeecrypt_java.la
++lib_LTLIBRARIES = libbeecrypt_java.la
+
+ libbeecrypt_java_la_SOURCES = \
+ beecrypt_tools.c \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/beecrypt/beecrypt-ac_python.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/beecrypt/beecrypt.spec?r1=1.70&r2=1.71&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
