X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssl.spec;h=6dd39aa9b8a7b8975bf23313ee67941bb02168fd;hb=ae07bcdc7e5293cbf54a25a72aaf881c56aba07a;hp=772545c65dc6514363a3cd7bc1f00f637549e35d;hpb=ef8e177699cf14ee2cd90e688ee242498f3188b3;p=packages%2Fopenssl.git

diff --git a/openssl.spec b/openssl.spec
index 772545c..6dd39aa 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -3,16 +3,22 @@ Summary:	OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
 Summary(de):	Secure Sockets Layer (SSL)-Kommunikationslibrary
 Summary(fr):	Utilitaires de communication SSL (Secure Sockets Layer)
 Name:		openssl
-Version:	0.9.6
-Release:	2
+Version:	0.9.6a
+Release:	4
+License:	Apache-style License
+Vendor:		The OpenSSL Project
 Group:		Libraries
-Group(pl):	Biblioteki
+Group(de):	Libraries
 Group(fr):	Librairies
+Group(pl):	Biblioteki
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-Patch0:		%{name}-perl.patch
-Vendor:		The OpenSSL Project
-License:	Apache-style License
-BuildRequires:	perl
+Patch0:		%{name}-alpha-ccc.patch
+# patch1 is only for 0.9.6a version. This version isn't binary
+# compatibile with 0.9.6 but have this same soname.
+Patch1:		%{name}-soname.patch
+Patch2:		%{name}-optflags.patch
+BuildRequires:	perl-devel >= 5.6.1
+BuildRequires:	textutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
@@ -33,8 +39,8 @@ 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
@@ -49,9 +55,9 @@ codage/decodage, incluant DES, RC4, RSA et SSL.
 
 %package tools
 Summary:	OpenSSL command line tool and utilities
-Group:		Utilities
-Group(pl):	Narzêdzia
-Group(fr):	Utilitaires
+Group:		Applications/Communications
+Group(de):	Applikationen/Kommunikation
+Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 
 %description tools
@@ -59,9 +65,10 @@ The OpenSSL Toolkit cmdline tool openssl and utility scripts.
 
 %package tools-perl
 Summary:	OpenSSL utilities written in Perl
-Group:		Utilities
-Group(pl):	Narzêdzia
+Group:		Applications/Communications
+Group(de):	Applikationen/Kommunikation
 Group(fr):	Utilitaires
+Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 
 %description tools-perl
@@ -73,8 +80,9 @@ Summary(de):	Secure Sockets Layer Kommunikationslibrary: statische libraries+hea
 Summary(fr):	Librairies statiques, headers et utilitaires pour communication SSL
 Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
+Group(de):	Entwicklung/Libraries
 Group(fr):	Development/Librairies
+Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 
 %description devel
@@ -87,8 +95,9 @@ Cz
 Summary:	Static OpenSSL libraries
 Summary(pl):	Statyczne wersje bibliotek z OpenSSL
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
+Group(de):	Entwicklung/Libraries
 Group(fr):	Development/Librairies
+Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 
 %description static
@@ -99,16 +108,21 @@ Statyczne wersje bibliotek z OpenSSL.
 
 %prep
 %setup -q 
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -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 "/usr/local/bin/perl" . | cut -d":" -f1`; do
+	perl -pi -e 's#/usr/local/bin/perl#%{_bindir}/perl#g' $f
 done
 
+touch Makefile.*
+
 perl util/perlpath.pl %{_bindir}/perl
 
+OPTFLAGS="%{rpmcflags}"
+export OPTFLAGS
 %ifarch i386 i486
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
 %endif
@@ -119,11 +133,13 @@ perl util/perlpath.pl %{_bindir}/perl
 ./Configure --openssldir=%{_var}/lib/%{name} linux-ppc shared
 %endif
 %ifarch alpha
-./Configure --openssldir=%{_var}/lib/%{name} linux-alpha shared
+./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} OPT_FLAGS="$RPM_OPT_FLAGS -DSSL_ALLOW_DH"
-%{__make} INSTALLTOP=%{_prefix} OPT_FLAGS="$RPM_OPT_FLAGS"
+%{__make}
 %{__make} rehash
 
 # Conv PODs to man pages. "openssl_" prefix is added to each manpage 
@@ -136,7 +152,7 @@ perl -pi -e 's/(\W)((?<!openssl_)\w+)(\(\d\))/$1openssl_$2$3/g; s/openssl_openss
 
 for pod in *.pod; do 
     if [ $pod != "openssl.pod" ]; then
-	mv $pod openssl_$pod;
+	mv -f $pod openssl_$pod;
 	pod=openssl_$pod;
     fi
 
@@ -165,7 +181,7 @@ for dir in ssl crypto; do
 	
 	for pod in *.pod; do 
        	    sec=`[ "$pod" = "des_modes.pod" ] && echo 7 || echo 3`;	
-  	    mv $pod openssl_$pod;
+  	    mv -f $pod openssl_$pod;
 	    pod=openssl_$pod;
 	    manpage=`basename $pod .pod`.$sec;
 	    pod2man --section="$sec" --release="$rel" --center=" " $pod > $manpage;
@@ -189,23 +205,17 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
 
 install libRSAglue.a libcrypto.a libssl.a 	$RPM_BUILD_ROOT%{_libdir}
 install lib*.so.*.* 	$RPM_BUILD_ROOT%{_libdir}
-cp -df 	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
 
-#cd perl
-#make install DESTDIR=$RPM_BUILD_ROOT
-#cd ..
-
-mv $RPM_BUILD_ROOT%{_var}/lib/%{name}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-ln -s ../../../%{_sysconfdir}/%{name}/openssl.cnf \
+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
 
-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.*.*
+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 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -213,7 +223,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
 
-gzip -9nf {CHANGES,CHANGES.SSLeay,LICENSE,NEWS,README,doc/*.txt} 
+gzip -9nf CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -240,7 +250,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -281,6 +290,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/CA.pl
 %attr(755,root,root) %{_libdir}/%{name}/der_chop
+%attr(755,root,root) %{_libdir}/%{name}/c_rehash
 %{_mandir}/man1/openssl_CA.pl.1*
 
 %files devel