--- BUILD/openssl-0.9.8/openssl.spec	2005-07-05 20:49:43.000000000 +0200
+++ SPECS/openssl-098.spec	2005-08-08 11:38:31.000000000 +0200
@@ -2,21 +2,23 @@
 %define libmin 9
 %define librel 8
 #%define librev a
-Release: 3
+Release: 1
 
-%define openssldir /var/ssl
+%define _prefix /usr/local/openssl-098
+%define openssldir %{_prefix}/var/ssl
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
-Name: openssl
+Name: openssl-098
 Version: %{libmaj}.%{libmin}.%{librel}
 #Version: %{libmaj}.%{libmin}.%{librel}%{librev}
-Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.openssl.org/source/openssl-%{version}.tar.gz
+#Source0: ftp://ftp.openssl.org/source/%{source}.tar.gz
 Copyright: Freely distributable
 Group: System Environment/Libraries
 Provides: SSL
 URL: http://www.openssl.org/
 Packager: Damien Miller <djm@mindrot.org>
-BuildRoot:   /var/tmp/%{name}-%{version}-root
+BuildRoot:   /var/tmp/openssl-%{version}-root
 
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -79,11 +81,12 @@
 
 %prep
 
-%setup -q
+%setup -q -n openssl-%{version}
+#%setup -q -n %{snap}
 
 %build 
 
-%define CONFIG_FLAGS -DSSL_ALLOW_ADH --prefix=/usr --openssldir=%{openssldir}
+%define CONFIG_FLAGS -DSSL_ALLOW_ADH --prefix=%{_prefix} --openssldir=%{openssldir}
 
 perl util/perlpath.pl /usr/bin/perl
 
@@ -102,25 +105,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make MANDIR=/usr/man MANSUFFIX=ssl INSTALL_PREFIX="$RPM_BUILD_ROOT" install
+make MANDIR=%{_prefix}/man MANSUFFIX=ssl INSTALL_PREFIX="$RPM_BUILD_ROOT" install
 
 # Make backwards-compatibility symlink to ssleay
-ln -sf /usr/bin/openssl $RPM_BUILD_ROOT/usr/bin/ssleay
+ln -sf %{_prefix}/bin/openssl $RPM_BUILD_ROOT/%{_prefix}/bin/ssleay
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(0644,root,root,0755)
 %doc CHANGES CHANGES.SSLeay LICENSE NEWS README
 
-%attr(0755,root,root) /usr/bin/*
-%attr(0755,root,root) /usr/lib/*.so*
+%attr(0755,root,root) %{_prefix}/bin/*
+%attr(0755,root,root) %{_prefix}/lib/*.so*
+%attr(0755,root,root) %{_prefix}/lib/engines/*.so*
+%attr(0644,root,root) %{_prefix}/lib/pkgconfig/openssl.pc
 %attr(0755,root,root) %{openssldir}/misc/*
-%attr(0644,root,root) /usr/man/man[157]/*
+%attr(0644,root,root) %{_prefix}/man/man[157]/*
 
 %config %attr(0644,root,root) %{openssldir}/openssl.cnf 
 %dir %attr(0755,root,root) %{openssldir}/certs
+#%dir %attr(0755,root,root) %{openssldir}/lib
 %dir %attr(0755,root,root) %{openssldir}/misc
 %dir %attr(0750,root,root) %{openssldir}/private
 
@@ -128,10 +134,9 @@
 %defattr(0644,root,root,0755)
 %doc CHANGES CHANGES.SSLeay LICENSE NEWS README
 
-%attr(0644,root,root) /usr/lib/*.a
-%attr(0644,root,root) /usr/lib/pkgconfig/openssl.pc
-%attr(0644,root,root) /usr/include/openssl/*
-%attr(0644,root,root) /usr/man/man[3]/*
+%attr(0644,root,root) %{_prefix}/lib/*.a
+%attr(0644,root,root) %{_prefix}/include/openssl/*
+%attr(0644,root,root) %{_prefix}/man/man[3]/*
 
 %files doc
 %defattr(0644,root,root,0755)
@@ -145,8 +150,6 @@
 ldconfig
 
 %changelog
-* Sun Jun  6 2005 Richard Levitte <richard@levitte.org>
-- Remove the incorrect installation of '%{openssldir}/lib'.
 * Wed May  7 2003 Richard Levitte <richard@levitte.org>
 - Add /usr/lib/pkgconfig/openssl.pc to the development section.
 * Thu Mar 22 2001 Richard Levitte <richard@levitte.org>