- pl, separated -static, fixed lib paths, cleanups

Changed files:
    cryptlib.spec -> 1.2

diff --git a/cryptlib.spec b/cryptlib.spec
index f3fbf5bb3a3a8c2fae8fccfe3db100913476bf16..331ccd90270898966066206c828de82ae56d6f1c 100644 (file)
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -1,14 +1,14 @@
 Summary:       Peter Gutmann's general purpose encryption library
+Summary(pl):   Biblioteka kryptograficzna ogólnego przeznaczenia Petera Gutmanna
 Name:          cryptlib
 Version:       3.22
 Release:       1
 License:       sleepycat
-URL:           http://www.cs.auckland.ac.nz/~pgut001/cryptlib/
+Group:         Libraries
 Source0:       ftp://ftp.franken.de/pub/crypt/cryptlib/cl322.zip
 # Source0-md5: 0944963faae4566f54aeb45c6e803142
-Group:         Libraries
+URL:           http://www.cs.auckland.ac.nz/~pgut001/cryptlib/
 BuildRequires: unzip
-Provides:      libcl.so
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,47 +20,75 @@ SAFER-SK, Blowfish, and Blowfish-SK conventional encryption, MD2, MD4,
 MD5, RIPEMD-160 and SHA hash algorithms, and Diffie-Hellman, DSA, and
 RSA public-key encryption.
 
+%description -l pl
+Biblioteka kryptograficzna cryptlib udostêpnia ³atwy w u¿yciu
+interfejs pozwalaj±cy nawet niedo¶wiaczonym programistom kryptografii
+³atwo dodawaæ do swoich programów us³ugi kryptograficzne i
+uwierzytelnienia. Biblioteka zawiera szyfry konwencjonalne DES, 3DES,
+IDEA, MDC/SHS, RC2, RC4, RC5, SAFER, SAFER-SK, Blowfish i Blowfish-SK,
+algorytmy skrótu MD2, MD4, MD5, RIPEMD-160 i SHA oraz szyfry klucza
+publicznego Diffie-Hellmana, DSA i RSA.
 
 %package devel
-Summary:       Header file and static library for cryptlib
+Summary:       Header file for cryptlib library
+Summary(pl):   Plik nag³ówkowy biblioteki cryptlib
 Group:         Development/Libraries
-Requires:      cryptlib
-Provides:      libcl.a 
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
-The header files and libraries for developing applications that use
-the cryptlib cryptography library.
+The header file for developing applications that use the cryptlib
+cryptography library.
+
+%description devel -l pl
+Plik nag³ówkowy do tworzenia aplikacji korzystaj±cych z biblioteki
+kryptograficznej cryptlib.
+
+%package static
+Summary:       Static cryptlib library
+Summary(pl):   Statyczna biblioteka cryptlib
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static cryptlib library.
+
+%description static -l pl
+Statyczna biblioteka cryptlib.
 
 %prep
 %setup -q -T -c
-unzip -L -a $RPM_SOURCE_DIR/cl322.zip
+unzip -L -a %{SOURCE0}
 
 %build
-%{__make} CMDC="$RPM_OPT_FLAGS"
-%{__make} shared CMDC="$RPM_OPT_FLAGS"
+%{__make} \
+       CMDC="%{rpmcflags}"
+%{__make} shared \
+       CMDC="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_prefix}/lib
-install -d $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
+
 install cryptlib.h $RPM_BUILD_ROOT%{_includedir}
-install libcl.a $RPM_BUILD_ROOT%{_prefix}/lib/libcl.a
-install libcl.so.3.2.2 $RPM_BUILD_ROOT%{_prefix}/lib/libcl.so.3.2.2
-ln -sf libcl.so.3.2.2 $RPM_BUILD_ROOT%{_prefix}/lib/libcl.so
+install libcl.a $RPM_BUILD_ROOT%{_libdir}
+install libcl.so.3.2.2 $RPM_BUILD_ROOT%{_libdir}
+ln -sf libcl.so.3.2.2 $RPM_BUILD_ROOT%{_libdir}/libcl.so
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%{_prefix}/lib/libcl.so
-%attr(755,root,root) %{_prefix}/lib/libcl.so.3.2.2
+%attr(755,root,root) %{_libdir}/libcl.so.3.2.2
 
 %files devel
 %defattr(644,root,root,755)
-%{_prefix}/lib/libcl.a
+%attr(755,root,root) %{_libdir}/libcl.so
 %{_includedir}/cryptlib.h
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libcl.a