X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=7404830a2bd5ddf674f786078d2c0f4a2c0dc7fb;hp=a136336e99bc44e8a97d638955c400714d02ca4a;hb=c385ff116340565a8ac1e6284a28233882ba0117;hpb=ce2ff00e5a60568a979c4be042169525dee4cd57

diff --git a/openssl.spec b/openssl.spec
index a136336..7404830 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,23 +1,36 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
 Summary(de):	Secure Sockets Layer (SSL)-Kommunikationslibrary
+Summary(es):	Biblioteca C que suministra algoritmos y protocolos criptográficos
 Summary(fr):	Utilitaires de communication SSL (Secure Sockets Layer)
+Summary(pl):	Biblioteki OpenSSL (SSL v2/v3)
+Summary(pt_BR):	Uma biblioteca C que fornece vários algoritmos e protocolos criptográficos
+Summary(ru):	âÉÂÌÉÏÔÅËÉ É ÕÔÉÌÉÔÙ ÄÌÑ ÓÏÅÄÉÎÅÎÉÊ ÞÅÒÅÚ Secure Sockets Layer
+Summary(uk):	â¦Â̦ÏÔÅËÉ ÔÁ ÕÔÉ̦ÔÉ ÄÌÑ Ú'¤ÄÎÁÎØ ÞÅÒÅÚ Secure Sockets Layer
 Name:		openssl
-Version:	0.9.5a
+Version:	0.9.7c
 Release:	3
+License:	Apache-style License
 Group:		Libraries
-Group(pl):	Biblioteki
-Group(fr):	Librairies
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-Patch0:		%{name}-perl.patch
-Vendor:		The OpenSSL Project
-License:	Apache-style License
-BuildRequires:	symlinks
-BuildRequires:	perl
+# Source0-md5:	c54fb36218adaaaba01ef733cd88c8ec
+Source1:	%{name}-ca-bundle.crt
+Source2:	%{name}.1.pl
+Source3:	%{name}-ssl-certificate.sh
+Patch0:		%{name}-alpha-ccc.patch
+Patch1:		%{name}-optflags.patch
+Patch2:		%{name}-globalCA.diff
+Patch3:		%{name}-parallel_make.patch
+Patch4:		%{name}-include.patch
+Patch5:         %{name}-makefile.patch
+URL:		http://www.openssl.org/
+BuildRequires:	perl-devel >= 5.6.1
+BuildRequires:	textutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
+Obsoletes:	libopenssl0
 
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -34,62 +47,112 @@ 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.
 
-This package contains shared libraries only, install openssl-tools
-if you want to use openssl cmdline tool.
+This package contains shared libraries only, install openssl-tools if
+you want to use openssl cmdline tool.
 
 %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.
+Entschlüsselungsalgorithmen und -protokolle, wie DES, RC4, RSA und SSL
+zur Verfügung stellen.
+
+%description -l es
+Biblioteca C que suministra algoritmos y protocolos criptográficos.
 
 %description -l fr
 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.
 
+%description -l pl
+Implementacja protoko³ów kryptograficznych Secure Socket Layer (SSL)
+v2/v3 oraz Transport Layer Security (TLS v1).
+
+%description -l pt_BR
+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
+ðÒÏÇÒÁÍÍÁ openssl ÄÌÑ ÒÁÂÏÔÙ Ó ÓÅÒÔÉÆÉËÁÔÁÍÉ É ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ,
+ËÏÔÏÒÙÅ ÒÅÁÌÉÚÕÀÔ ÍÎÏÖÅÔÓ×Ï ËÒÉÐÔÏÇÒÁÆÉÞÅÓËÉÈ ÁÌÇÏÒÉÔÍÏ×, ×ËÌÀÞÁÑ DES,
+RC4, RSA É SSL.
+
+%description -l uk
+ðÒÏÇÒÁÍÁ openssl ÄÌÑ ÒÏÂÏÔÉ Ú ÓÅÒÔÉƦËÁÔÁÍÉ ÔÁ ¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ
+ËÏÒÉÓÔÕ×ÁÎÎÑ, ÝÏ ÒÅÁ̦ÚÕÀÔØ ×ÅÌÉËÕ Ë¦ÌØ˦ÓÔØ ËÒÉÐÔÏÇÒÁƦÞÎÉÈ
+ÁÌÇÏÒÉÔͦ×, ×ËÌÀÞÁÀÞÉ DES, RC4, RSA ÔÁ SSL.
+
 %package tools
 Summary:	OpenSSL command line tool and utilities
-Group:		Utilities
-Group(pl):	Narzêdzia
-Group(fr):	Utilitaires
+Summary(pl):	Zestaw narzêdzi i skryptów
+Group:		Applications/Communications
 Requires:	%{name} = %{version}
 
 %description tools
 The OpenSSL Toolkit cmdline tool openssl and utility scripts.
 
+%description tools -l pl
+Zestaw narzêdzi i skryptów wywo³ywanych z linii poleceñ.
+
 %package tools-perl
 Summary:	OpenSSL utilities written in Perl
-Group:		Utilities
-Group(pl):	Narzêdzia
-Group(fr):	Utilitaires
+Summary(pl):	Narzêdzia OpenSSL napisane w perlu
+Group:		Applications/Communications
 Requires:	%{name} = %{version}
 
 %description tools-perl
-OpenSSL Toolkit tools written in Perl
+OpenSSL Toolkit tools written in Perl.
+
+%description tools-perl -l pl
+Narzêdzia OpenSSL napisane w perlu.
 
 %package devel
 Summary:	Development part of OpenSSL Toolkit libraries
 Summary(de):	Secure Sockets Layer Kommunikationslibrary: statische libraries+header
+Summary(es):	Bibliotecas y archivos de inclusión para desarrollo OpenSSL
 Summary(fr):	Librairies statiques, headers et utilitaires pour communication SSL
 Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów
+Summary(pt_BR):	Bibliotecas e arquivos de inclusão para desenvolvimento OpenSSL
+Summary(ru):	âÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÙ É ÕÔÉÌÉÔÙ ÄÌÑ Secure Sockets Layer
+Summary(uk):	â¦Â̦ÏÔÅËÉ, ÈÅÄÅÒÉ ÔÁ ÕÔÉ̦ÔÉ ÄÌÑ Secure Sockets Layer
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Group(fr):	Development/Librairies
 Requires:	%{name} = %{version}
+Obsoletes:	libopenssl0-devel
 
 %description devel
 Development part of OpenSSL library.
 
+%description devel -l es
+Bibliotecas y archivos de inclusión para desarrollo OpenSSL
+
 %description devel -l pl
 Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów.
 
+%description devel -l pt_BR
+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
+ðÒÏÇÒÁÍÍÁ openssl ÄÌÑ ÒÁÂÏÔÙ Ó ÓÅÒÔÉÆÉËÁÔÁÍÉ É ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ,
+ËÏÔÏÒÙÅ ÒÅÁÌÉÚÕÀÔ ÍÎÏÖÅÔÓ×Ï ËÒÉÐÔÏÇÒÁÆÉÞÅÓËÉÈ ÁÌÇÏÒÉÔÍÏ×, ×ËÌÀÞÁÑ DES,
+RC4, RSA É SSL. ÷ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ É ÈÅÄÅÒÙ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÉÌÏÖÅÎÉÊ
+Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ SSL.
+
+%description devel -l uk
+ðÒÏÇÒÁÍÁ openssl ÄÌÑ ÒÏÂÏÔÉ Ú ÓÅÒÔÉƦËÁÔÁÍÉ ÔÁ ¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ
+ËÏÒÉÓÔÕ×ÁÎÎÑ, ÝÏ ÒÅÁ̦ÚÕÀÔØ ×ÅÌÉËÕ Ë¦ÌØ˦ÓÔØ ËÒÉÐÔÏÇÒÁƦÞÎÉÈ
+ÁÌÇÏÒÉÔͦ×, ×ËÌÀÞÁÀÞÉ DES, RC4, RSA ÔÁ SSL. í¦ÓÔÉÔØ Â¦Â̦ÏÔÅËÉ ÔÁ
+ÈÅÄÅÒÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ SSL.
+
 %package static
 Summary:	Static OpenSSL libraries
 Summary(pl):	Statyczne wersje bibliotek z OpenSSL
+Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento com openssl
+Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ OpenSSL
+Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ OpenSSL
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Group(fr):	Development/Librairies
 Requires:	%{name}-devel = %{version}
 
 %description static
@@ -98,130 +161,171 @@ Static OpenSSL Toolkit libraries.
 %description static -l pl
 Statyczne wersje bibliotek z OpenSSL.
 
+%description static -l pt_BR
+Bibliotecas estáticas para desenvolvimento com openssl.
+
+%description static -l ru
+ðÒÏÇÒÁÍÍÁ openssl ÄÌÑ ÒÁÂÏÔÙ Ó ÓÅÒÔÉÆÉËÁÔÁÍÉ É ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ,
+ËÏÔÏÒÙÅ ÒÅÁÌÉÚÕÀÔ ÍÎÏÖÅÔÓ×Ï ËÒÉÐÔÏÇÒÁÆÉÞÅÓËÉÈ ÁÌÇÏÒÉÔÍÏ×, ×ËÌÀÞÁÑ DES,
+RC4, RSA É SSL. ÷ËÌÀÞÁÅÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ
+ÐÒÉÌÏÖÅÎÉÊ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ OpenSSL.
+
+%description static -l uk
+ðÒÏÇÒÁÍÁ openssl ÄÌÑ ÒÏÂÏÔÉ Ú ÓÅÒÔÉƦËÁÔÁÍÉ ÔÁ ¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ
+ËÏÒÉÓÔÕ×ÁÎÎÑ, ÝÏ ÒÅÁ̦ÚÕÀÔØ ×ÅÌÉËÕ Ë¦ÌØ˦ÓÔØ ËÒÉÐÔÏÇÒÁƦÞÎÉÈ
+ÁÌÇÏÒÉÔͦ×, ×ËÌÀÞÁÀÞÉ DES, RC4, RSA ÔÁ SSL. í¦ÓÔÉÔØ ÓÔÁÔÉÞΦ
+¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ SSL.
+
 %prep
-%setup -q 
-%patch -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %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
+for f in ` grep -r "%{_prefix}/local/bin/perl" . | cut -d":" -f1`; do
+%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' $f
 done
 
-perl util/perlpath.pl %{_bindir}
+touch Makefile.*
+
+%{__perl} util/perlpath.pl %{__perl}
+
+OPTFLAGS="%{rpmcflags}"
+export OPTFLAGS
+%ifarch i386 i486
+./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
+%endif
+%ifarch i586 i686 athlon
+./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared
+%endif
+%ifarch amd64
+./Configure --openssldir=%{_var}/lib/%{name} linux-x86_64 shared
+%endif
+%ifarch ppc
+./Configure --openssldir=%{_var}/lib/%{name} linux-ppc shared
+%endif
+%ifarch alpha
+./Configure --openssldir=%{_var}/lib/%{name} threads linux-alpha+bwx-gcc shared
+%endif
+%ifarch sparc
+./Configure --openssldir=%{_var}/lib/%{name} threads linux-sparcv8 shared
+%endif
+
+%{__make} \
+	CC="%{__cc}" \
+	INSTALLTOP=%{_prefix}
+
+%{__make} rehash \
+	CC="%{__cc}" \
+	INSTALLTOP=%{_prefix}
+
+# Conv PODs to man pages. "openssl_" prefix is added to each manpage
+# to avoid potential conflicts with others packages.
+center="OpenSSL 0.9.7"
+rel="OpenSSL 0.9.7"
 
-./config --openssldir=%{_var}/lib/%{name}
+cd doc/apps || exit 1
+%{__perl} -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
 
-%{__make} OPT_FLAGS="$RPM_OPT_FLAGS" linux-shared
-%{__make} INSTALLTOP=%{_prefix} OPT_FLAGS="$RPM_OPT_FLAGS"
-%{__make} rehash
+for pod in *.pod; do
+	if [ $pod != "openssl.pod" ]; then
+		mv -f $pod openssl_$pod;
+		pod=openssl_$pod;
+	fi
 
-# Conv PODs to man pages. "openssl_" prefix is added to each manpage 
-# to avoid potential conflicts with others packages.
-center="OpenSSL 0.9.5a"
-rel="OpenSSL 0.9.5a"
-
-cd doc/apps || exit 1 
-perl -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
-
-for pod in *.pod; do 
-    if [ $pod != "openssl.pod" ]; then
-	mv $pod openssl_$pod;
-	pod=openssl_$pod;
-    fi
-
-    sec=1
-    if [ $pod = "openssl_config.pod" ]; then
-	sec=5
-    fi
-
-    manpage=`basename $pod .pod`.$sec;	    
-    pod2man --section="$sec" --release="$rel" --center="$center" \
-	    $pod > $manpage;
-    echo "$manpage";
+	sec=1
+	if [ $pod = "openssl_config.pod" ]; then
+		sec=5
+	fi
+
+	manpage=`basename $pod .pod`.$sec;
+	pod2man --section="$sec" --release="$rel" --center="$center" \
+		$pod > $manpage;
+	echo "$manpage";
 done
 cd ..
 
 sec=3
-for dir in ssl crypto; do 
+for dir in ssl crypto; do
 	cd $dir || exit 1;
 	if [ $dir = "ssl" ]; then
 		rel="OpenSSL SSL/TLS library"
-	elif [ $dir = "crypto" ]; then 
+	elif [ $dir = "crypto" ]; then
 		rel="OpenSSL cryptographic library"
 	fi
-	
-	perl -p -i -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
-	
-	for pod in *.pod; do 
-       	    sec=`[ "$pod" = "des_modes.pod" ] && echo 7 || echo 3`;	
-  	    mv $pod openssl_$pod;
-	    pod=openssl_$pod;
-	    manpage=`basename $pod .pod`.$sec;
-	    pod2man --section="$sec" --release="$rel" --center=" " $pod > $manpage;
-	    echo "$manpage";
+
+	%{__perl} -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openssl/openssl/g;' *.pod;
+
+	for pod in *.pod; do
+		sec=`[ "$pod" = "des_modes.pod" ] && echo 7 || echo 3`;
+		mv -f $pod openssl_$pod;
+		pod=openssl_$pod;
+		manpage=`basename $pod .pod`.$sec;
+		pod2man --section="$sec" --release="$rel" --center=" " $pod > $manpage;
+		echo "$manpage";
 	done
 	cd ..
 done
 
 #cd perl
-#perl Makefile.PL
-#make
+#%%{__perl} Makefile.PL \
+#	INSTALLDIRS=vendor
+#%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
-	   $RPM_BUILD_ROOT%{_mandir}/{man1,man3,man5,man7}
+	$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_PREFIX=$RPM_BUILD_ROOT \
+	MANDIR=%{_mandir}
 
-install libRSAglue.a 	$RPM_BUILD_ROOT%{_libdir}
-install lib*.so.*.* 	$RPM_BUILD_ROOT%{_libdir}
-cp -d 	lib*.so		$RPM_BUILD_ROOT%{_libdir}
+if [ "%{_prefix}/lib/pkgconfig" != "%{_pkgconfigdir}" ] ; then
+	mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/* \
+		$RPM_BUILD_ROOT%{_pkgconfigdir}
+fi
 
-#cd perl
-#make install DESTDIR=$RPM_BUILD_ROOT
-#cd ..
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/ssl/ca-bundle.crt
+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
 
-mv $RPM_BUILD_ROOT%{_var}/lib/%{name}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 ln -s %{_sysconfdir}/%{name}/openssl.cnf \
 	$RPM_BUILD_ROOT%{_var}/lib/%{name}/%{name}.cnf
-symlinks -cs $RPM_BUILD_ROOT%{_var}/lib/%{name}
 
-mv $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/*  $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
 
-mv $RPM_BUILD_ROOT%{_bindir}/c_rehash $RPM_BUILD_ROOT%{_libdir}/%{name}
-
-strip $RPM_BUILD_ROOT%{_bindir}/* || :
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
-
-gzip -9nf doc/apps/*.?
-gzip -9nf doc/ssl/*.?
-gzip -9nf doc/crypto/*.?
+mv -f $RPM_BUILD_ROOT%{_bindir}/c_rehash $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 find $RPM_BUILD_ROOT%{_mandir} -type f | xargs rm -f
-install doc/apps/*.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
-install doc/apps/*.5.gz $RPM_BUILD_ROOT%{_mandir}/man5
-install doc/ssl/*.3.gz doc/crypto/*.3.gz $RPM_BUILD_ROOT%{_mandir}/man3
-install doc/crypto/*.7.gz $RPM_BUILD_ROOT%{_mandir}/man7
-
-gzip -9nf {CHANGES,CHANGES.SSLeay,LICENSE,NEWS,README,doc/*.txt}
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+install doc/apps/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install doc/apps/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install doc/ssl/*.3 doc/crypto/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
+install doc/crypto/*.7 $RPM_BUILD_ROOT%{_mandir}/man7
+install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%doc {CHANGES,CHANGES.SSLeay,LICENSE,NEWS,README}.gz
-%doc doc/*.txt.gz doc/openssl_button.gif doc/openssl_button.html
+%doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
+%doc doc/openssl_button.gif doc/openssl_button.html
 
 %files tools
 %defattr(644,root,root,755)
@@ -229,61 +333,70 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_var}/lib/%{name}
 %dir %{_var}/lib/%{name}/private
 %dir %{_var}/lib/%{name}/certs
+
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/%{name}/openssl.cnf
 %verify(not md5 size mtime) %config(noreplace) %{_var}/lib/%{name}/openssl.cnf
+%dir %{_datadir}/ssl
+%verify(not md5 size mtime) %config(noreplace) %{_datadir}/ssl/ca-bundle.crt
 
 %attr(755,root,root) %{_bindir}/%{name}
+%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_rehash
 %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.gz
-%{_mandir}/man1/openssl_asn1parse.1.gz
-%{_mandir}/man1/openssl_ca.1.gz
-%{_mandir}/man1/openssl_ciphers.1.gz
-%{_mandir}/man1/openssl_crl.1.gz
-%{_mandir}/man1/openssl_crl2pkcs7.1.gz
-%{_mandir}/man1/openssl_dgst.1.gz
-%{_mandir}/man1/openssl_dhparam.1.gz
-%{_mandir}/man1/openssl_dsa.1.gz
-%{_mandir}/man1/openssl_dsaparam.1.gz
-%{_mandir}/man1/openssl_enc.1.gz
-%{_mandir}/man1/openssl_gendsa.1.gz
-%{_mandir}/man1/openssl_genrsa.1.gz
-%{_mandir}/man1/openssl_nseq.1.gz
-%{_mandir}/man1/openssl_passwd.1.gz
-%{_mandir}/man1/openssl_pkcs12.1.gz
-%{_mandir}/man1/openssl_pkcs7.1.gz
-%{_mandir}/man1/openssl_pkcs8.1.gz
-%{_mandir}/man1/openssl_rand.1.gz
-%{_mandir}/man1/openssl_req.1.gz
-%{_mandir}/man1/openssl_rsa.1.gz
-%{_mandir}/man1/openssl_s_client.1.gz
-%{_mandir}/man1/openssl_s_server.1.gz
-%{_mandir}/man1/openssl_sess_id.1.gz
-%{_mandir}/man1/openssl_smime.1.gz
-%{_mandir}/man1/openssl_speed.1.gz
-%{_mandir}/man1/openssl_spkac.1.gz
-%{_mandir}/man1/openssl_verify.1.gz
-%{_mandir}/man1/openssl_version.1.gz
-%{_mandir}/man1/openssl_x509.1.gz
-%{_mandir}/man5/*.5.gz
+%{_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_enc.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_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/*.5*
+%lang(pl) %{_mandir}/pl/man1/openssl.1*
 
 %files tools-perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/CA.pl
 %attr(755,root,root) %{_libdir}/%{name}/der_chop
-%{_mandir}/man1/openssl_CA.pl.1.gz
+%attr(755,root,root) %{_libdir}/%{name}/c_rehash
+%{_mandir}/man1/openssl_CA.pl.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/%{name}
-%{_mandir}/man3/*.3.gz
+%{_pkgconfigdir}/openssl.pc
+%{_mandir}/man3/openssl*.3*
+%{_mandir}/man7/*.7*
 
 %files static
 %defattr(644,root,root,755)