X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssl.spec;h=5dec8c9b996e461b7967194498e6dc14727880f3;hb=fa6b6d1561a5d10ef88f13c973e09ec46c47f544;hp=202fc4b362e9a0c3cda837c8bb7333fbdc86038d;hpb=2b2149ff977904853171c9f3135f957888a5d3b1;p=packages%2Fopenssl.git

diff --git a/openssl.spec b/openssl.spec
index 202fc4b..5dec8c9 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,31 +1,49 @@
+#
+# Conditional build:
+%bcond_without	tests	# don't perform "make tests"
+%bcond_with	purify	# Compile openssl with \-DPURIFY, useful when one wants to
+			# use valgrind debugger against openssl-linked programs
+#
 %include	/usr/lib/rpm/macros.perl
-Summary:	Toolkit for the "Secure Sockets Layer" (SSL v2/v3)
-Summary(de):	Secure Sockets Layer (SSL)-Kommunikationslibrary & Utilities
-Summary(fr):	Utilitaires de communication SSL (Secure Sockets Layer)
+Summary:	OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
+Summary(de.UTF-8):	Secure Sockets Layer (SSL)-Kommunikationslibrary
+Summary(es.UTF-8):	Biblioteca C que suministra algoritmos y protocolos criptográficos
+Summary(fr.UTF-8):	Utilitaires de communication SSL (Secure Sockets Layer)
+Summary(pl.UTF-8):	Biblioteki OpenSSL (SSL v2/v3)
+Summary(pt_BR.UTF-8):	Uma biblioteca C que fornece vários algoritmos e protocolos criptográficos
+Summary(ru.UTF-8):	Библиотеки и утилиты для соединений через Secure Sockets Layer
+Summary(uk.UTF-8):	Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:		openssl
-Version:	0.9.5a
-Release:	3
+Version:	0.9.8i
+Release:	5
+License:	Apache-like
 Group:		Libraries
-Group(fr):	Librairies
-Group(pl):	Biblioteki
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-Patch0:		openssl-perl.patch
-Vendor:		The OpenSSL Project
-License:	Apache-style License
-BuildRequires:	symlinks
-BuildRequires:	perl
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Prereq:		fileutils
-Prereq:		sed
-Prereq:		%{name}-libs = %{version}
+# Source0-md5:	561e00f18821c74b2b86c8c7786f9d8b
+Source2:	%{name}.1.pl
+Source3:	%{name}-ssl-certificate.sh
+Source4:	%{name}-c_rehash.sh
+Patch0:		%{name}-alpha-ccc.patch
+Patch1:		%{name}-optflags.patch
+Patch2:		%{name}-globalCA.diff
+Patch3:		%{name}-include.patch
+Patch4:		%{name}-libvar.patch
+Patch5:		%{name}-man-namespace.patch
+Patch6:		%{name}-asflag.patch
+Patch7:		%{name}-ca-certificates.patch
+URL:		http://www.openssl.org/
+BuildRequires:	bc
+BuildRequires:	perl-devel >= 1:5.6.1
+BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	sed >= 4.0
 Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
-
-%define		openssldir	/var/lib/openssl
-%define		_sysconfdir	/etc/%{name}
-%define		_pkglibdir	%{_libdir}/%{name}
-%define		_pkgincludedir	%{_includedir}/%{name}
+Obsoletes:	libopenssl0
+Requires:	ca-certificates >= 20080809-4
+Requires:	rpm-whiteout >= 1.7
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -42,146 +60,377 @@ Apache-style licence, which basically means that you are free to get
 and use it for commercial and non-commercial purposes subject to some
 simple license conditions.
 
-%description -l de
-Openssl enthält das OpenSSL Zertifikatsmanagementtool und shared
-libraries, die verschiedene Verschlüsselungs- und
-Entschlüsselungsalgorithmen und
-- -protokolle, wie DES, RC4, RSA und SSL zur Verfügung stellen.
+This package contains shared libraries only, install openssl-tools if
+you want to use openssl cmdline tool.
+
+%description -l de.UTF-8
+Openssl enthält das OpenSSL Zertifikatsmanagementtool und shared
+libraries, die verschiedene Verschlüsselungs- und
+Entschlüsselungsalgorithmen und -protokolle, wie DES, RC4, RSA und SSL
+zur Verfügung stellen.
+
+%description -l es.UTF-8
+Biblioteca C que suministra algoritmos y protocolos criptográficos.
 
-%description -l fr
+%description -l fr.UTF-8
 OpenSSL est un outiil de gestion des certificats et les librairies
 partagees qui fournit plusieurs protocoles et algorithmes de
 codage/decodage, incluant DES, RC4, RSA et SSL.
 
-%package libs
-Summary:	The OpenSSL shared libraries
-Summary(de):	Secure Sockets Layer Kommunikationslibrary: statische libraries+header                           
-Summary(fr):	Librairies statiques, headers et utilitaires pour communication SSL (Secure Sockets Layer)
-Summary(pl):	Biblioteki dzilelone OpenSSL
-Group:		Libraries
-Group(fr):	Librairies
-Group(pl):	Biblioteki
+%description -l pl.UTF-8
+Implementacja protokołów kryptograficznych Secure Socket Layer (SSL)
+v2/v3 oraz Transport Layer Security (TLS v1).
+
+%description -l pt_BR.UTF-8
+Uma biblioteca C que fornece vários algoritmos e protocolos
+criptográficos, incluindo DES, RC4, RSA e SSL. Inclui bibliotecas
+compartilhadas e utilitários.
+
+%description -l ru.UTF-8
+Программа openssl для работы с сертификатами и разделяемые библиотеки,
+которые реализуют множетсво криптографических алгоритмов, включая DES,
+RC4, RSA и SSL.
+
+%description -l uk.UTF-8
+Програма openssl для роботи з сертифікатами та бібліотеки спільного
+користування, що реалізують велику кількість криптографічних
+алгоритмів, включаючи DES, RC4, RSA та SSL.
+
+%package tools
+Summary:	OpenSSL command line tool and utilities
+Summary(pl.UTF-8):	Zestaw narzędzi i skryptów
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
 
-%description libs
-The OpenSSL shared libraries
+%description tools
+The OpenSSL Toolkit cmdline tool openssl and utility scripts.
+
+%description tools -l pl.UTF-8
+Zestaw narzędzi i skryptów wywoływanych z linii poleceń.
+
+%package tools-perl
+Summary:	OpenSSL utilities written in Perl
+Summary(pl.UTF-8):	Narzędzia OpenSSL napisane w perlu
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
+
+%description tools-perl
+OpenSSL Toolkit tools written in Perl.
+
+%description tools-perl -l pl.UTF-8
+Narzędzia OpenSSL napisane w perlu.
 
 %package devel
-Summary:	Development part of OpenSSL library
-Summary(de):	Secure Sockets Layer Kommunikationslibrary: statische libraries+header                           
-Summary(fr):	Librairies statiques, headers et utilitaires pour communication SSL (Secure Sockets Layer)
-Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów
+Summary:	Development part of OpenSSL Toolkit libraries
+Summary(de.UTF-8):	Secure Sockets Layer Kommunikationslibrary: statische libraries+header
+Summary(es.UTF-8):	Bibliotecas y archivos de inclusión para desarrollo OpenSSL
+Summary(fr.UTF-8):	Librairies statiques, headers et utilitaires pour communication SSL
+Summary(pl.UTF-8):	Część bibiloteki OpenSSL przeznaczona dla programistów
+Summary(pt_BR.UTF-8):	Bibliotecas e arquivos de inclusão para desenvolvimento OpenSSL
+Summary(ru.UTF-8):	Библиотеки, хедеры и утилиты для Secure Sockets Layer
+Summary(uk.UTF-8):	Бібліотеки, хедери та утиліти для Secure Sockets Layer
 Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-libs = %{version}
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libopenssl0-devel
 
 %description devel
 Development part of OpenSSL library.
 
-%description devel -l pl
-Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów.
+%description devel -l es.UTF-8
+Bibliotecas y archivos de inclusión para desarrollo OpenSSL
+
+%description devel -l pl.UTF-8
+Część biblioteki OpenSSL przeznaczona dla programistów.
+
+%description devel -l pt_BR.UTF-8
+Uma biblioteca C que fornece vários algoritmos e protocolos
+criptográficos, incluindo DES, RC4, RSA e SSL. Inclui bibliotecas e
+arquivos de inclusão para desenvolvimento.
+
+%description devel -l ru.UTF-8
+Программа openssl для работы с сертификатами и разделяемые библиотеки,
+которые реализуют множетсво криптографических алгоритмов, включая DES,
+RC4, RSA и SSL. Включает библиотеки и хедеры для разработки приложений
+с использованием SSL.
+
+%description devel -l uk.UTF-8
+Програма openssl для роботи з сертифікатами та бібліотеки спільного
+користування, що реалізують велику кількість криптографічних
+алгоритмів, включаючи DES, RC4, RSA та SSL. Містить бібліотеки та
+хедери для розробки програм з використанням SSL.
 
 %package static
-Summary:	Static OpenSSL library
-Summary(pl):	Statyczna wersja biblioteki OpenSSL
+Summary:	Static OpenSSL libraries
+Summary(pl.UTF-8):	Statyczne wersje bibliotek z OpenSSL
+Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com openssl
+Summary(ru.UTF-8):	Статические библиотеки разработчика для OpenSSL
+Summary(uk.UTF-8):	Статичні бібліотеки програміста для OpenSSL
 Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static OpenSSL library.
+Static OpenSSL Toolkit libraries.
 
-%description static -l pl
-Statyczna wersja biblioteki OpenSSL.
+%description static -l pl.UTF-8
+Statyczne wersje bibliotek z OpenSSL.
 
-%prep
-%setup -q 
-%patch -p1
+%description static -l pt_BR.UTF-8
+Bibliotecas estáticas para desenvolvimento com openssl.
 
-%build
-for i in Configure Makefile.org ; do
-        perl -pi -e 's#-m486##g' $i
-	perl -pi -e 's#-O3 -fomit-frame-pointer#%{optflags}#g' $i
-done
+%description static -l ru.UTF-8
+Программа openssl для работы с сертификатами и разделяемые библиотеки,
+которые реализуют множетсво криптографических алгоритмов, включая DES,
+RC4, RSA и SSL. Включает статические библиотеки для разработки
+приложений с использованием OpenSSL.
 
-perl util/perlpath.pl %{_bindir}
+%description static -l uk.UTF-8
+Програма openssl для роботи з сертифікатами та бібліотеки спільного
+користування, що реалізують велику кількість криптографічних
+алгоритмів, включаючи DES, RC4, RSA та SSL. Містить статичні
+бібліотеки для розробки програм з використанням SSL.
 
-./config --openssldir=%{openssldir}
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
+	`grep -l -r "%{_prefix}/local/bin/perl" *`
 
-%{__make} OPT_FLAGS="$RPM_OPT_FLAGS" linux-shared
-%{__make} INSTALLTOP=%{_prefix} OPT_FLAGS="$RPM_OPT_FLAGS"
-%{__make} rehash
-#cd perl
-#perl Makefile.PL
-#make
+%build
+touch Makefile.*
+
+%{__perl} util/perlpath.pl %{__perl}
+
+OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
+./Configure \
+%if "%{pld_release}" == "ti"
+	--openssldir=%{_var}/lib/%{name} \
+%else
+	--openssldir=%{_sysconfdir}/%{name} \
+%endif
+	--lib=%{_lib} \
+	shared threads \
+	enable-mdc2 enable-rc5 \
+%ifarch %{ix86}
+%ifarch i386
+	386 linux-elf
+# ^- allow running on 80386 (default code uses bswapl available on i486+)
+%else
+	linux-elf
+%endif
+%endif
+%ifarch alpha
+	linux-alpha+bwx-gcc
+%endif
+%ifarch %{x8664}
+	linux-x86_64
+%endif
+%ifarch ia64
+	linux-ia64
+%endif
+%ifarch ppc
+	linux-ppc
+%endif
+%ifarch ppc64
+	linux-ppc64
+%endif
+%ifarch sparc
+	linux-sparcv8
+%endif
+%ifarch sparcv9
+	linux-sparcv9
+%endif
+%ifarch sparc64
+	linux64-sparcv9
+%endif
+
+%{__make} -j1 all rehash %{?with_tests:tests} \
+	CC="%{__cc}" \
+	ASFLAG='$(CFLAG) -Wa,--noexecstack' \
+	INSTALLTOP=%{_prefix}
+
+# Rename POD sources of man pages. "openssl_" prefix is added to each
+# manpage to avoid potential conflicts with other packages.
+
+for dir in doc/{apps,ssl,crypto}; do
+	cd $dir || exit 1;
+	%{__perl} -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
+
+	for pod in !(openssl*).pod; do
+		mv -f $pod openssl_$pod;
+	done
+	cd ../..
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_pkglibdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
+	$RPM_BUILD_ROOT{%{_mandir}/{pl/man1,man{1,3,5,7}},%{_datadir}/ssl} \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} install \
 	INSTALLTOP=%{_prefix} \
-	INSTALL_PREFIX=$RPM_BUILD_ROOT
-
-install libRSAglue.a 	$RPM_BUILD_ROOT%{_libdir}
-install lib*.so.*.* 	$RPM_BUILD_ROOT%{_libdir}
-cp -d 	lib*.so		$RPM_BUILD_ROOT%{_libdir}
-
-#cd perl
-#make install DESTDIR=$RPM_BUILD_ROOT
-#cd ..
-
-mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}
-ln -s %{_sysconfdir}/openssl.cnf \
-	$RPM_BUILD_ROOT%{openssldir}/openssl.cnf
-symlinks -cs $RPM_BUILD_ROOT%{openssldir}
-
-mv $RPM_BUILD_ROOT%{openssldir}/misc/*	$RPM_BUILD_ROOT%{_pkglibdir}
-rm -rf $RPM_BUILD_ROOT%{openssldir}/misc
-
-strip $RPM_BUILD_ROOT%{_bindir}/* || :
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
-
-gzip -9nf CHANGES CHANGES.SSLeay LICENSE NEWS README \
-	doc/*.txt doc/*/*pod
-
-%post
-%{_bindir}/c_rehash certs
-
-%post libs
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
+	INSTALL_PREFIX=$RPM_BUILD_ROOT \
+	MANDIR=%{_mandir}
+
+install libcrypto.a libssl.a $RPM_BUILD_ROOT%{_libdir}
+install lib*.so.*.* $RPM_BUILD_ROOT%{_libdir}
+ln -sf libcrypto.so.*.* $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
+ln -sf libssl.so.*.* $RPM_BUILD_ROOT%{_libdir}/libssl.so
+
+%if "%{pld_release}" == "ti"
+ln -sf %{_var}/lib/%{name}/%{name}.cnf \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/openssl.cnf
+ln -sf %{_var}/lib/%{name}/certs \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/certs
+ln -sf %{_var}/lib/%{name}/private \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/private
+mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
+%else
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc
+%endif
+
+# not installed as individual utilities (see openssl dgst instead)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1
+
+install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
+install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/c_rehash.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%if "%{pld_release}" == "ti"
+%triggerin -- %{name}-tools < 0.9.8i-2
+if [ -L /var/lib/openssl/openssl.cnf ] ; then
+	echo "Saving old configuration as /var/lib/openssl/openssl.cnf.rpmsave"
+	rm /var/lib/openssl/openssl.cnf
+	mv %{_sysconfdir}/%{name}/openssl.cnf /var/lib/openssl/openssl.cnf.rpmsave 2>/dev/null || :
+fi
+%else
+%triggerpostun -- %{name} < 0.9.8i-2
+if [ -d /var/lib/openssl/certs ] ; then
+	mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || :
+fi
+if [ -d /var/lib/openssl/private ] ; then
+	mv /var/lib/openssl/private/* %{_sysconfdir}/%{name}/private 2>/dev/null || :
+fi
+if [ -d /var/lib/openssl ] ; then
+	for f in /var/lib/openssl/* ; do
+		[ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || :
+	done
+fi
+%endif
+
 %files
 %defattr(644,root,root,755)
-%doc {CHANGES,CHANGES.SSLeay,LICENSE,NEWS,README}.gz
-%doc doc/*.txt.gz doc/apps 
+%doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
 %doc doc/openssl_button.gif doc/openssl_button.html
-
-%attr(755,root,root) %{_bindir}/*
-%dir %{_sysconfdir}
-%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/openssl.cnf
-%verify(not md5 size mtime) %config(noreplace) %{openssldir}/openssl.cnf
-%{openssldir}/certs
-%{openssldir}/private
-%dir %{_pkglibdir}
-%attr(755,root,root) %{_pkglibdir}/*
-
-%files libs
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libcrypto.so.*.*.*
+%attr(755,root,root) %{_libdir}/libssl.so.*.*.*
+%dir %{_libdir}/engines
+%attr(755,root,root) %{_libdir}/engines/*.so
+%if "%{pld_release}" == "ti"
+%dir %{_var}/lib/%{name}
+%dir %{_var}/lib/%{name}/certs
+%dir %{_var}/lib/%{name}/private
+%dir %{_sysconfdir}/%{name}
+%attr(755,root,root) %{_sysconfdir}/%{name}/certs
+%attr(755,root,root) %{_sysconfdir}/%{name}/private
+%else
+%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/certs
+%dir %{_sysconfdir}/%{name}/private
+%endif
+%dir %{_datadir}/ssl
+
+%files tools
+%defattr(644,root,root,755)
+%if "%{pld_release}" == "ti"
+%{_sysconfdir}/%{name}/openssl.cnf
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/%{name}/openssl.cnf
+%else
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf
+%endif
+%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/c_rehash.sh
+%attr(754,root,root) %{_bindir}/ssl-certificate
+
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/CA.sh
+%attr(755,root,root) %{_libdir}/%{name}/c_hash
+%attr(755,root,root) %{_libdir}/%{name}/c_info
+%attr(755,root,root) %{_libdir}/%{name}/c_issuer
+%attr(755,root,root) %{_libdir}/%{name}/c_name
+
+%{_mandir}/man1/openssl.1*
+%{_mandir}/man1/openssl_asn1parse.1*
+%{_mandir}/man1/openssl_ca.1*
+%{_mandir}/man1/openssl_ciphers.1*
+%{_mandir}/man1/openssl_crl.1*
+%{_mandir}/man1/openssl_crl2pkcs7.1*
+%{_mandir}/man1/openssl_dgst.1*
+%{_mandir}/man1/openssl_dhparam.1*
+%{_mandir}/man1/openssl_dsa.1*
+%{_mandir}/man1/openssl_dsaparam.1*
+%{_mandir}/man1/openssl_ec.1*
+%{_mandir}/man1/openssl_ecparam.1*
+%{_mandir}/man1/openssl_enc.1*
+%{_mandir}/man1/openssl_errstr.1*
+%{_mandir}/man1/openssl_gendsa.1*
+%{_mandir}/man1/openssl_genrsa.1*
+%{_mandir}/man1/openssl_nseq.1*
+%{_mandir}/man1/openssl_ocsp.1*
+%{_mandir}/man1/openssl_passwd.1*
+%{_mandir}/man1/openssl_pkcs12.1*
+%{_mandir}/man1/openssl_pkcs7.1*
+%{_mandir}/man1/openssl_pkcs8.1*
+%{_mandir}/man1/openssl_rand.1*
+%{_mandir}/man1/openssl_req.1*
+%{_mandir}/man1/openssl_rsa.1*
+%{_mandir}/man1/openssl_rsautl.1*
+%{_mandir}/man1/openssl_s_client.1*
+%{_mandir}/man1/openssl_s_server.1*
+%{_mandir}/man1/openssl_s_time.1*
+%{_mandir}/man1/openssl_sess_id.1*
+%{_mandir}/man1/openssl_smime.1*
+%{_mandir}/man1/openssl_speed.1*
+%{_mandir}/man1/openssl_spkac.1*
+%{_mandir}/man1/openssl_verify.1*
+%{_mandir}/man1/openssl_version.1*
+%{_mandir}/man1/openssl_x509.1*
+%{_mandir}/man5/openssl_config.5*
+%{_mandir}/man5/openssl_x509v3_config.5*
+%lang(pl) %{_mandir}/pl/man1/openssl.1*
+
+%files tools-perl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/c_rehash
+%attr(755,root,root) %{_libdir}/%{name}/CA.pl
+%{_mandir}/man1/openssl_CA.pl.1*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/ssl doc/crypto
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_pkgincludedir}
+%attr(755,root,root) %{_libdir}/libcrypto.so
+%attr(755,root,root) %{_libdir}/libssl.so
+%{_includedir}/%{name}
+%{_pkgconfigdir}/libcrypto.pc
+%{_pkgconfigdir}/libssl.pc
+%{_pkgconfigdir}/openssl.pc
+%{_mandir}/man3/openssl*.3*
+%{_mandir}/man7/openssl_des_modes.7*
 
 %files static
 %defattr(644,root,root,755)