- cleanups

diff --git a/cryptopp.spec b/cryptopp.spec
index 7fae51f947e63c7f810f310a3fff3e427a26e99f..fb12b8fc25f01fb081eeed812e2c6c76c9951cdc 100644 (file)
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -4,9 +4,9 @@ Summary(pl.UTF-8):      Cryptopp - biblioteka klas C++ dostarczająca narzędzia do k
 Name:          cryptopp
 Version:       5.6.1
 Release:       2
-License:       GPL
+License:       BSD-like
 Group:         Libraries
-Source0:       http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}%{orig_ver}.zip
+Source0:       http://downloads.sourceforge.net/cryptopp/%{name}%{orig_ver}.zip
 # Source0-md5: 96cbeba0907562b077e26bcffb483828
 Patch0:                %{name}-autotools.patch
 Patch1:                cxx.patch
@@ -14,7 +14,7 @@ URL:          http://www.cryptopp.com/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:1.5
 BuildRequires: unzip
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -22,8 +22,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Cryptopp Library is a free C++ class library of cryptographic schemes.
 
 %description -l pl.UTF-8
-Cryptopp jest biblioteką klas C++ dostarczającą narzędzia do kryptografii.
-
+Cryptopp jest biblioteką klas C++ dostarczającą narzędzia do
+kryptografii.
 
 %package devel
 Summary:       Files for development of applications which will use Cryptopp
@@ -61,8 +61,7 @@ Statyczna biblioteka Cryptopp.
 %{__autoheader}
 %{__automake}
 
-%configure \
-       CXXFLAGS="%{rpmcxxflags}"
+%configure
 
 %{__make}
 
@@ -83,14 +82,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc License.txt Readme.txt
-%attr(755,root,root) %ghost %{_libdir}/libcryptopp.so.4
 %attr(755,root,root) %{_libdir}/libcryptopp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcryptopp.so.4
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/cryptopp
-%attr(755,root,root) %{_libdir}/libcryptopp.la
 %attr(755,root,root) %{_libdir}/libcryptopp.so
+%{_libdir}/libcryptopp.la
+%{_includedir}/cryptopp
 
 %files static
 %defattr(644,root,root,755)