X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=58e78b0a3ae1d2115413e089e03ae20eaa6aa3cf;hp=0ef306f7e6dfabd6c8644c2b2745a602be0e0715;hb=60c581d043333026784555581d1ab9e666b6121f;hpb=fc613e9a60138bae333f689db29bedb11a92132c

diff --git a/openssl.spec b/openssl.spec
index 0ef306f..58e78b0 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,23 +1,27 @@
-Summary: 	Library and toolkit for the "Secure Sockets Layer" (SSL v2/v3)
+%include	/usr/lib/rpm/macros.perl
+Summary:	Library and toolkit for the "Secure Sockets Layer" (SSL v2/v3)
 Summary(de):	Secure Sockets Layer (SSL)-Kommunikationslibrary & Utilities
-Name: 		openssl
-Version: 	0.9.3a
-Release: 	1
-Group: 		Libraries
+Summary(fr):	Utilitaires et librairies de communication SSL (Secure Sockets Layer)
+Name:		openssl
+Version:	0.9.5a
+Release:	1
+Group:		Libraries
+Group(fr):	Librairies
 Group(pl):	Biblioteki
-Source: 	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-Patch0:		openssl-sslcrypto.patch
-Patch1:		openssl-perl.patch
-Vendor: 	The OpenSSL Project
-License: 	Apache-style License
+Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
+Patch0:		openssl-perl.patch
+Vendor:		The OpenSSL Project
+License:	Apache-style License
 BuildRequires:	symlinks
 BuildRequires:	perl
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Prereq:		fileutils
+Prereq:		sed
 Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 
-%define		openssldir	/var/state/openssl
+%define		openssldir	/var/lib/openssl
 %define		_sysconfdir	/etc/%{name}
 %define		_pkglibdir	%{_libdir}/%{name}
 %define		_pkgincludedir	%{_includedir}/%{name}
@@ -30,7 +34,7 @@ v1) protocols with full-strength cryptography world-wide. The project
 is managed by a worldwide community of volunteers that use the
 Internet to communicate, plan, and develop the OpenSSL tookit and its
 related documentation.
-   
+
 OpenSSL is based on the excellent SSLeay library developed by Eric A.
 Young and Tim J. Hudson. The OpenSSL toolkit is licensed under an
 Apache-style licence, which basically means that you are free to get
@@ -38,21 +42,23 @@ and use it for commercial and non-commercial purposes subject to some
 simple license conditions.
 
 %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.                                                 
+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.
 
 %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.
+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.
 
 %package devel
 Summary:	Development part of OpenSSL library
-Summary(fr):	Librairies statiques, headers et utilitaires pour communication SSL (Secure Sockets Layer)
 Summary(de):	Secure Sockets Layer Kommunikationslibrary: statische libraries+header                           
+Summary(fr):	Librairies statiques, headers et utilitaires pour communication SSL (Secure Sockets Layer)
 Summary(pl):	Czê¶æ bibiloteki OpenSSL przeznaczona dla programistów
 Group:		Development/Libraries
+Group(fr):	Development/Librairies
 Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 
@@ -66,6 +72,7 @@ Cz
 Summary:	Static OpenSSL library
 Summary(pl):	Statyczna wersja biblioteki OpenSSL
 Group:		Development/Libraries
+Group(fr):	Development/Librairies
 Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 
@@ -76,27 +83,25 @@ Static OpenSSL library.
 Statyczna wersja biblioteki OpenSSL.
 
 %prep
-%setup  -q 
-%patch0 -p1
-%patch1 -p1
+%setup -q 
+%patch -p1
 
 %build
-for i in ` echo Configure Makefile.org `; do
-        sed -e 's#-m486##g' \
-		-e 's#-O3 -fomit-frame-pointer#%{optflags}#g' \
-		<$i >$i.work
-        mv $i.work $i
+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
 done
 
 perl util/perlpath.pl %{_bindir}
 
-ln -s crypto sslcrypto
-
 ./config --openssldir=%{openssldir}
 
 make OPT_FLAGS="$RPM_OPT_FLAGS" linux-shared
 make INSTALLTOP=%{_prefix} OPT_FLAGS="$RPM_OPT_FLAGS"
 make rehash
+#cd perl
+#perl Makefile.PL
+#make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -109,8 +114,11 @@ make install \
 
 install libRSAglue.a 	$RPM_BUILD_ROOT%{_libdir}
 install lib*.so.*.* 	$RPM_BUILD_ROOT%{_libdir}
-mv 	lib*.so		$RPM_BUILD_ROOT%{_libdir}
+cp -d 	lib*.so		$RPM_BUILD_ROOT%{_libdir}
 
+#cd perl
+#make install DESTDIR=$RPM_BUILD_ROOT
+#cd ..
 
 mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}
 ln -s %{_sysconfdir}/openssl.cnf \
@@ -121,10 +129,10 @@ mv $RPM_BUILD_ROOT%{openssldir}/misc/*	$RPM_BUILD_ROOT%{_pkglibdir}
 rm -rf $RPM_BUILD_ROOT%{openssldir}/misc
 
 strip $RPM_BUILD_ROOT%{_bindir}/* || :
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* || :
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 
-gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
-	doc/*.pod doc/*.txt
+gzip -9nf CHANGES CHANGES.SSLeay LICENSE NEWS README \
+	doc/*.txt doc/*/*pod
 
 %post
 %{_bindir}/c_rehash certs
@@ -138,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc {CHANGES,CHANGES.SSLeay,LICENSE,NEWS,README}.gz
-%doc doc/*.pod.gz doc/*.txt.gz
+%doc doc/*.txt.gz doc/apps 
 %doc doc/openssl_button.gif doc/openssl_button.html
 
 %attr(755,root,root) %{_bindir}/*
@@ -152,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/ssl doc/crypto
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_pkgincludedir}