X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=e2e7a27b8cbd55bcfab7ed38661a19898c131ad9;hp=4a604d23c8863822ccb65fb86bf76d3af8b262d3;hb=878dbd69cab54d904827edd6838600623910815c;hpb=68befec3861f8690657e603f608b8bc6e898d9e4

diff --git a/openssl.spec b/openssl.spec
index 4a604d2..e2e7a27 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,19 +1,14 @@
-# conditional build:
-# _without_embed - don't build uClibc version
 %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(pl):	Biblioteki OpenSSL (SSL v2/v3)
 Summary(fr):	Utilitaires de communication SSL (Secure Sockets Layer)
 Name:		openssl
 Version:	0.9.6b
-Release:	6
+Release:	7
 License:	Apache-style License
 Vendor:		The OpenSSL Project
 Group:		Libraries
-Group(de):	Libraries
-Group(es):	Bibliotecas
-Group(fr):	Librairies
-Group(pl):	Biblioteki
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 Patch0:		%{name}-alpha-ccc.patch
 # patch1 is only for 0.9.6a version. This version isn't binary
@@ -23,21 +18,12 @@ Patch2:		%{name}-optflags.patch
 Patch3:		%{name}-nocrypt.patch
 BuildRequires:	perl-devel >= 5.6.1
 BuildRequires:	textutils
-%if %{!?_without_embed:1}%{?_without_embed:0}
-BuildRequires:	uClibc-devel
-BuildRequires:	uClibc-static
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
 
-%define embed_path	/usr/lib/embed
-%define embed_cc	%{_arch}-uclibc-cc
-%define embed_cflags	%{rpmcflags} -Os
-%define uclibc_prefix	/usr/%{_arch}-linux-uclibc
-
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, full-featured, and Open Source toolkit implementing
@@ -67,36 +53,40 @@ 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).
+
 %package tools
 Summary:	OpenSSL command line tool and utilities
+Summary(pl):	Zestaw narzêdzi i skryptów
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
 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
+Summary(pl):	Narzêdzia OpenSSL napisane w perlu
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(fr):	Utilitaires
-Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 
 %description tools-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(fr):	Librairies statiques, headers et utilitaires pour communication SSL
 Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 Obsoletes:	libopenssl0-devel
 
@@ -110,25 +100,12 @@ Cz
 Summary:	Development part of OpenSSL Toolkit embedded libraries
 Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla aplikacji wbudowanych
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 
-%description devel-embed
-Development part of OpenSSL library for embedded applications.
-
-%description -l pl devel-embed
-Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów aplikacji
-wbudowanych.
-
 %package static
 Summary:	Static OpenSSL libraries
 Summary(pl):	Statyczne wersje bibliotek z OpenSSL
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 
 %description static
@@ -138,15 +115,15 @@ Static OpenSSL Toolkit libraries.
 Statyczne wersje bibliotek z OpenSSL.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
 %build
-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
+for f in ` grep -r "%{_prefix}/local/bin/perl" . | cut -d":" -f1`; do
+perl -pi -e 's#%{_prefix}/local/bin/perl#%{_bindir}/perl#g' $f
 done
 
 touch Makefile.*
@@ -158,7 +135,7 @@ export OPTFLAGS
 %ifarch i386 i486
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared 386
 %endif
-%ifarch i586 i686
+%ifarch i586 i686 athlon
 ./Configure --openssldir=%{_var}/lib/%{name} linux-elf shared
 %endif
 %ifarch ppc
@@ -171,62 +148,53 @@ export OPTFLAGS
 ./Configure --openssldir=%{_var}/lib/%{name} threads linux-sparcv8 shared
 %endif
 
-%if %{!?_without_embed:1}%{?_without_embed:0}
-%{__make} CC=%{embed_cc}
-%{__make} rehash CC=%{embed_cc}
-for f in RSAglue crypto ssl ; do
-	mv -f lib$f.a lib$f.a-embed
-done
-%{__make} clean
-%endif
-
 %{__make}
 %{__make} rehash
 
-# Conv PODs to man pages. "openssl_" prefix is added to each manpage 
+# Conv PODs to man pages. "openssl_" prefix is added to each manpage
 # to avoid potential conflicts with others packages.
 center="OpenSSL 0.9.6"
 rel="OpenSSL 0.9.6"
 
-cd doc/apps || exit 1 
+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 -f $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";
+for pod in *.pod; do
+	if [ $pod != "openssl.pod" ]; then
+		mv -f $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";
 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 -f $pod openssl_$pod;
-	    pod=openssl_$pod;
-	    manpage=`basename $pod .pod`.$sec;
-	    pod2man --section="$sec" --release="$rel" --center=" " $pod > $manpage;
-	    echo "$manpage";
+
+	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
@@ -238,14 +206,14 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
-	   $RPM_BUILD_ROOT%{_mandir}/man{1,3,5,7}
+	$RPM_BUILD_ROOT%{_mandir}/man{1,3,5,7}
 
 %{__make} install \
 	INSTALLTOP=%{_prefix} \
 	INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install libRSAglue.a libcrypto.a libssl.a 	$RPM_BUILD_ROOT%{_libdir}
-install lib*.so.*.* 	$RPM_BUILD_ROOT%{_libdir}
+install libRSAglue.a 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
 
@@ -253,7 +221,7 @@ mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdi
 ln -s %{_sysconfdir}/%{name}/openssl.cnf \
 	$RPM_BUILD_ROOT%{_var}/lib/%{name}/%{name}.cnf
 
-mv -f $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 -f $RPM_BUILD_ROOT%{_bindir}/c_rehash $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -264,15 +232,6 @@ 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
 
-%if %{!?_without_embed:1}%{?_without_embed:0}
-install -d $RPM_BUILD_ROOT%{uclibc_prefix}/{include,lib}
-for f in RSAglue crypto ssl ; do
-	install lib$f.a-embed $RPM_BUILD_ROOT%{uclibc_prefix}/lib/lib$f.a
-done
-cp -a $RPM_BUILD_ROOT%{_includedir}/%{name} \
-	$RPM_BUILD_ROOT%{uclibc_prefix}/include
-%endif
-
 gzip -9nf CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
 
 %post   -p /sbin/ldconfig
@@ -349,13 +308,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}
 %{_mandir}/man3/*.3*
 
-%if %{!?_without_embed:1}%{?_without_embed:0}
-%files devel-embed
-%defattr(644,root,root,755)
-%{uclibc_prefix}/lib/*
-%{uclibc_prefix}/include/%{name}
-%endif
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a