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

diff --git a/openssl.spec b/openssl.spec
index 0ef306f..559d4b2 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,18 +1,19 @@
+%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
+Summary(fr):	Utilitaires et librairies de communication SSL (Secure Sockets Layer)
 Name: 		openssl
-Version: 	0.9.3a
+Version: 	0.9.5
 Release: 	1
 Group: 		Libraries
 Group(pl):	Biblioteki
 Source: 	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-Patch0:		openssl-sslcrypto.patch
-Patch1:		openssl-perl.patch
+Patch:		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)
 Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
@@ -49,8 +50,8 @@ 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(pl):	Programowanie/Biblioteki
@@ -76,27 +77,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 +108,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 \
@@ -124,7 +126,7 @@ strip $RPM_BUILD_ROOT%{_bindir}/* || :
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* || :
 
 gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
-	doc/*.pod doc/*.txt
+	doc/*.txt doc/*/*pod
 
 %post
 %{_bindir}/c_rehash certs
@@ -138,7 +140,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 +154,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}