X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=beecrypt.spec;h=7d55be80007679eda4f331d159de358a09fdf54b;hb=d48e113855b2fae526551e447e78582badf5dfc4;hp=5a1ff010322f2392163366fccd89d6a2d18f1f92;hpb=fd2228fdb0d35fbf0db7f4cff2f1f50543446ffc;p=packages%2Fbeecrypt.git

diff --git a/beecrypt.spec b/beecrypt.spec
index 5a1ff01..7d55be8 100644
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -1,30 +1,34 @@
 #
+# WARNING: despite unchanged SONAME, the RSA ABI (and API) has changed since 3.x!
 # Conditional build:
 %bcond_with	javaglue	# build with Java support
 %bcond_without	python		# don't build python module
 #
-%include	/usr/lib/rpm/macros.python
 Summary:	The BeeCrypt Cryptography Library
 Summary(pl):	Biblioteka kryptograficzna BeeCrypt
 Name:		beecrypt
-Version:	3.1.0
-Release:	3
+Version:	4.0.0
+Release:	2
 Epoch:		2
 License:	LGPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz
-# Source0-md5:	1472cada46e2ab9f532f984de9740386
+# Source0-md5:	f19e060ecc4fc23d8f1268e1b145614f
 Patch0:		%{name}-opt.patch
-Patch1:		%{name}-python.patch
-Patch2:		%{name}-lib64_fix.patch
+Patch1:		%{name}-lib64_fix.patch
+Patch2:		%{name}-ac_python.patch
 URL:		http://sourceforge.net/projects/beecrypt/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	doxygen
 BuildRequires:	libtool
-%{?with_python:BuildRequires:	python-devel}
+%if %{with python}
+BuildRequires:	python-devel
+BuildRequires:	python-modules
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	specflags_alpha		 -mno-explicit-relocs 
+%define		specflags_alpha		 -mno-explicit-relocs 
 
 %description
 BeeCrypt is an open source cryptography library that contains highly
@@ -78,48 +82,49 @@ Pakiet python-beecrypt zawiera modu
 Pythonie na u¿ywanie interfejsu dostarczanego przez bibliotekê BeeCrytp.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2
+%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
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	--without-cplusplus \
 	--with%{!?with_javaglue:out}-javaglue \
 	--with-cpu=%{_target_cpu} \
 	--with-arch=%{_target_cpu} \
 	--with-pic \
 	--with%{!?with_python:out}-python
-%{__make} \
-	libaltdir=%{_libdir} \
-	pylibdir=%{py_libdir}
+%{__make}
 
 %if %{with python}
-%{__make} -C python \
-	pylibdir=%{py_libdir}
+%{__make} -C python
 %endif
 
+doxygen
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}
 
 %{__make} install \
-	libaltdir=%{_libdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with python}
 %{__make} install -C python \
-	libaltdir=%{_libdir} \
-	pylibdir=%{py_libdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -133,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc docs/html/*
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/*