- strict deps.

[packages/beecrypt.git] / beecrypt.spec

diff --git a/beecrypt.spec b/beecrypt.spec
index 7227afab1689d63286fb9dead015815a406e0fc6..c025ac454622d319969e8089a91d2683c81115a6 100644 (file)
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -8,7 +8,7 @@ Summary:        The BeeCrypt Cryptography Library
 Summary(pl):   Biblioteka kryptograficzna BeeCrypt
 Name:          beecrypt
 Version:       3.1.0
-Release:       2
+Release:       3
 Epoch:         2
 License:       LGPL
 Group:         Libraries
@@ -40,7 +40,7 @@ szyfrowania m.in.: Blowfish, MD5, SHA-1, Diffie-Hellman oraz ElGamal.
 Summary:       The BeeCrypt Cryptography Library - development files
 Summary(pl):   Pliki dla programistów u¿ywaj±cych biblioteki BeeCrypt
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 The BeeCrypt Cryptography Library - development files.
@@ -52,7 +52,7 @@ Biblioteka kryptograficzna BeeCrypt - pliki dla programist
 Summary:       The BeeCrypt Cryptography Library - static library
 Summary(pl):   Biblioteka statyczna BeeCrypt
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 The BeeCrypt Cryptography Library - static library.
@@ -64,7 +64,7 @@ Biblioteka statyczna BeeCrypt.
 Summary:       Python interface to BeeCrypt library
 Summary(pl):   Pythonowy interfejs do biblioteki BeeCrypt
 Group:         Development/Languages/Python
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 %pyrequires_eq python
 
 %description -n python-beecrypt
@@ -93,11 +93,15 @@ rm -f missing
        --with%{!?with_javaglue:out}-javaglue \
        --with-cpu=%{_target_cpu} \
        --with-arch=%{_target_cpu} \
+       --with-pic \
        --with%{!?with_python:out}-python
-%{__make}
+%{__make} \
+       libaltdir=%{_libdir} \
+       pylibdir=%{py_libdir}
 
 %if %{with python}
-%{__make} -C python
+%{__make} -C python \
+       pylibdir=%{py_libdir}
 %endif
 
 %install
@@ -105,17 +109,16 @@ 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
 
-%ifarch amd64
-mv $RPM_BUILD_ROOT{%{_prefix}/lib/*,%{_libdir}}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT