openssl: Fix installation of man pages.

Some of the man pages conflict with others from
the man-pages package. To avoid any conflicts, those
files got an "ssl" added to their name.

Fixes #10092.

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 0cbe7f99416b0102850fd4b8a4a43d4d4a5a5d4a..60a5e6699aa89bff5cf9500970ed3fb28a221f49 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.1
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -31,6 +31,7 @@ build
        end
 
        CFLAGS += -DPURIFY
+       export RPM_OPT_FLAGS = %{CFLAGS}
 
        prepare_cmds
                find crypto/ -name Makefile -exec \
@@ -113,7 +114,7 @@ build
                cp -v -r certs %{BUILDROOT}/etc/pki/tls
 
                # Rename man pages so that they don't conflict with other system man pages.
-               pushd ${BUILDROOT}/usr/share/man
+               pushd %{BUILDROOT}%{mandir}
                for manpage in man*/*; do
                        if [ -L ${manpage} ]; then
                                TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
@@ -123,9 +124,6 @@ build
                                mv ${manpage} ${manpage}ssl
                        fi
                done
-
-               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}passwd.1
-               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}rand.1
                popd
        end
 end
@@ -138,8 +136,7 @@ packages
 
                requires += ca-certificates
 
-               provides += libcrypto.so.10(libcrypto.so.10)
-               provides += libssl.so.10(libssl.so.10)
+               files += %{libdir}/openssl
        end
 
        package %{name}-devel