X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=7e32e51282def5eb3abc151424551eb17432981f;hp=cf548d2d0af6e1ffc0f18b5c7abcfa98e4134cd6;hb=4b3de4ed0ccc39a03909028ace828d8f74e835fc;hpb=2b4f707ee3853c5dc241605bdf596d7f8f72ceff

diff --git a/openssl.spec b/openssl.spec
index cf548d2..7e32e51 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -8,23 +8,23 @@ Summary(pt_BR):	Uma biblioteca C que fornece v
 Summary(ru):	âÉÂÌÉÏÔÅËÉ É ÕÔÉÌÉÔÙ ÄÌÑ ÓÏÅÄÉÎÅÎÉÊ ÞÅÒÅÚ Secure Sockets Layer
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÔÁ ÕÔÉ̦ÔÉ ÄÌÑ Ú'¤ÄÎÁÎØ ÞÅÒÅÚ Secure Sockets Layer
 Name:		openssl
-Version:	0.9.7a
-Release:	2
+Version:	0.9.7d
+Release:	3
 License:	Apache-style License
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
+# Source0-md5:	1b49e90fc8a75c3a507c0a624529aca5
 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}-sec3.patch
-Patch5:		%{name}-security2.patch
+Patch3:		%{name}-include.patch
+Patch4:		%{name}-smime.patch
 URL:		http://www.openssl.org/
-BuildRequires:	perl-devel >= 5.6.1
-BuildRequires:	textutils
-BuildRequires:	perl-tools-pod
+BuildRequires:	perl-devel >= 1:5.6.1
+BuildRequires:	rpm-perlprov >= 4.1-13
 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.
@@ -181,13 +181,11 @@ RC4, RSA 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
-%patch5 -p0
+%patch4 -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,12 +193,16 @@ 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
+%endif
+%ifarch amd64
+./Configure --openssldir=%{_var}/lib/%{name} linux-x86_64 shared
+%endif
 %ifarch ppc
 ./Configure --openssldir=%{_var}/lib/%{name} linux-ppc shared
 %endif
@@ -211,8 +213,13 @@ export OPTFLAGS
 ./Configure --openssldir=%{_var}/lib/%{name} threads linux-sparcv8 shared
 %endif
 
-%{__make} CC="%{__cc}"
-%{__make} rehash CC="%{__cc}"
+%{__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.
@@ -265,18 +272,24 @@ done
 #cd perl
 #%%{__perl} Makefile.PL \
 #	INSTALLDIRS=vendor
-#make
+#%{__make}
 
 %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}
@@ -298,6 +311,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
@@ -310,20 +324,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
 %doc doc/openssl_button.gif doc/openssl_button.html
+%dir %{_var}/lib/%{name}
+%dir %{_var}/lib/%{name}/certs
+%dir %{_var}/lib/%{name}/private
 
 %files tools
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/%{name}
-%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
+%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
@@ -356,6 +371,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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*
@@ -377,7 +393,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/%{name}
-%{_libdir}/pkgconfig/openssl.pc
+%{_pkgconfigdir}/openssl.pc
 %{_mandir}/man3/openssl*.3*
 %{_mandir}/man7/*.7*