- strict internal deps, removed redundant BR textutils

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index a03868deea2ed255b3e9515ecb0d825922e62857..5885217ec1541e8106205f2fa0646d8517b44c62 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -9,13 +9,14 @@ Summary(ru):  
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÔÁ ÕÔÉ̦ÔÉ ÄÌÑ Ú'¤ÄÎÁÎØ ÞÅÒÅÚ Secure Sockets Layer
 Name:          openssl
 Version:       0.9.7c
-Release:       1
+Release:       3
 License:       Apache-style License
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 # 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
@@ -24,7 +25,6 @@ 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
@@ -86,7 +86,7 @@ RC4, RSA 
 Summary:       OpenSSL command line tool and utilities
 Summary(pl):   Zestaw narzêdzi i skryptów
 Group:         Applications/Communications
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description tools
 The OpenSSL Toolkit cmdline tool openssl and utility scripts.
@@ -98,7 +98,7 @@ Zestaw narz
 Summary:       OpenSSL utilities written in Perl
 Summary(pl):   Narzêdzia OpenSSL napisane w perlu
 Group:         Applications/Communications
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description tools-perl
 OpenSSL Toolkit tools written in Perl.
@@ -116,7 +116,7 @@ Summary(pt_BR):     Bibliotecas e arquivos de inclus
 Summary(ru):   âÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÙ É ÕÔÉÌÉÔÙ ÄÌÑ Secure Sockets Layer
 Summary(uk):   â¦Â̦ÏÔÅËÉ, ÈÅÄÅÒÉ ÔÁ ÕÔÉ̦ÔÉ ÄÌÑ Secure Sockets Layer
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     libopenssl0-devel
 
 %description devel
@@ -152,7 +152,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ OpenSSL
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ OpenSSL
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static OpenSSL Toolkit libraries.
@@ -185,9 +185,8 @@ RC4, RSA 
 %patch5 -p1
 
 %build
-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} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
+       `grep -l -r "%{_prefix}/local/bin/perl"`
 
 touch Makefile.*
 
@@ -195,13 +194,14 @@ touch Makefile.*
 
 OPTFLAGS="%{rpmcflags}"
 export OPTFLAGS
+%ifarch %{ix86}
 %ifarch i386 i486
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
-%endif
-%ifarch i586 i686 athlon
+%else
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared
 %endif
-%ifarch x86_64
+%endif
+%ifarch amd64
 ./Configure --openssldir=%{_var}/lib/%{name} linux-x86_64 shared
 %endif
 %ifarch ppc
@@ -278,13 +278,19 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 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{%{_mandir}/{pl/man1,man{1,3,5,7}},%{_datadir}/ssl} \
+       $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} install \
        INSTALLTOP=%{_prefix} \
        INSTALL_PREFIX=$RPM_BUILD_ROOT \
        MANDIR=%{_mandir}
 
+if [ "%{_prefix}/lib/pkgconfig" != "%{_pkgconfigdir}" ] ; then
+       mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/* \
+               $RPM_BUILD_ROOT%{_pkgconfigdir}
+fi
+
 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}
@@ -306,6 +312,7 @@ 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
@@ -332,6 +339,7 @@ rm -rf $RPM_BUILD_ROOT
 %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