From 9583cca278fe621f894a52af97221f29e59b6cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz@fedoraproject.org>
Date: Wed, 26 Aug 2009 15:50:36 +0000
Subject: [PATCH] - drop the compat symlink hacks

---
 openssl.spec | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/openssl.spec b/openssl.spec
index da84457..cb06d1d 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.4.%{beta}%{?dist}
+Release: 0.5.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -74,14 +74,6 @@ BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
 BuildRequires: /usr/bin/rename
 Requires: mktemp, ca-certificates >= 2008-5
 
-# Temporary hack
-Requires(post): coreutils
-%ifarch ppc64 s390x sparc64 x86_64
-Provides: libcrypto.so.8()(64bit) libssl.so.8()(64bit)
-%else
-Provides: libcrypto.so.8 libssl.so.8
-%endif
-
 %description
 The OpenSSL toolkit provides support for secure communications between
 machines. OpenSSL includes a certificate management tool and shared
@@ -264,8 +256,6 @@ for lib in $RPM_BUILD_ROOT%{_libdir}/*.so.%{version} ; do
 	chmod 755 ${lib}
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.%{soversion}
-# Temporary hack
-	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.8
 
 done
 
@@ -382,9 +372,6 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 %attr(0644,root,root) %{_mandir}/man5*/*
 %attr(0644,root,root) %{_mandir}/man7*/*
 
-# Temporary hack
-%attr(0755,root,root) %{_libdir}/*.so.8
-
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/openssl
@@ -407,18 +394,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 
 %postun -p /sbin/ldconfig
 
-%triggerpostun -- openssl < 1.0.0
-# Temporary hack
-[ $1 != 0 ] || exit 0
-if [ "$(readlink %{_libdir}/libcrypto.so.8)" != libcrypto.so.%{version} ] ; then
-    ln -sf libcrypto.so.%{version} %{_libdir}/libcrypto.so.8 || :
-fi
-if [ "$(readlink %{_libdir}/libssl.so.8)" != libssl.so.%{version} ] ; then
-    ln -sf libssl.so.%{version} %{_libdir}/libssl.so.8 || :
-fi
-/sbin/ldconfig -X
-
 %changelog
+* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.5.beta3
+- drop the compat symlink hacks
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.4.beta3
 - constify SSL_CIPHER_description()