Update spec

openssl1.1.spec

@@ -22,7 +22,7 @@
 Summary:	OpenSSL 1.1 for platforms with OpenSSL 1.0 as the main version of OpenSSL
 Name:		%{oname}%{major}
 Version:	1.1.1j
-Release:	1
+Release:	2
 License:	OpenSSL
 Group:		System/Libraries
 URL:		https://www.openssl.org
@@ -50,7 +50,7 @@ BuildRequires:	perl
 BuildRequires:	/usr/bin/pod2html
 BuildRequires:	/usr/bin/pod2man
 %endif
-Requires:	%{engines_name} = %{EVRD}
+#Requires:	%{engines_name} = %{EVRD}
 Requires:	perl-base
 Requires:	rootcerts
 # using /etc/pki/tls from the main openssl package (openssl 1.0)
@@ -216,7 +216,6 @@ sslarch=linux-generic64
 
 %check
 # Verify that what was compiled actually works.
-#export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 export LD_LIBRARY_PATH=%{buildroot}%{_optdir}/%{name}/lib
 # from OMV and ALT
 OPENSSL_ENABLE_MD5_VERIFY=
@@ -240,79 +239,9 @@ make test
 %install
 
 %makeinstall_std
-#( cd %{buildroot}%{_bindir}
-#  mv openssl openssl%{major}
-#)
-
-# Based on libressl, rename mans xxx.N to openssl1.1_xxx.N
-#for i in $(seq 1 8)
-#do
-#  man_dir="%{buildroot}%{_mandir}/man${i}"
-#  if [ ! -d "$man_dir" ]; then continue; fi
-#  ( cd "$man_dir"
-#    grep -Irl '/etc/ssl' . | xargs sed -i 's,/etc/ssl,%{_openssldir},g' || :
-#    if find . -name '%{name}_*' | grep -q '.' ; then
-#      echo 'Rewrite spec because upstream %{name}_* manpages appeared!'
-#      exit 1
-#    fi
-#    # Make all man pages with potentially the same names as in OpenSSL
-#    # be avaialble in standard man directories, but prevent conflicts with OpenSSL
-#    for openssl_manpage in $(ls -1v | grep -vE '^OPENSSL_|^openssl\.') ; do
-#      openssl_LibreSSL_manpage="%{name}_${openssl_manpage}"
-#      mv -v "$openssl_manpage" "$openssl_LibreSSL_manpage"
-#    done
-#    for openssl_manpage in $(ls -1v | grep '^openssl\.') ; do
-#      openssl_LibreSSL_manpage="$(echo "$openssl_manpage" | sed -e 's,openssl,%{name},g')"
-#      mv -v "$openssl_manpage" "$openssl_LibreSSL_manpage"
-#    done
-
-#    # relink symlinks
-#    error=0
-#    for i in *
-#    do
-#	  if [ ! -L "$i" ]; then continue; fi
-#      realpath="$(realpath "$i")"
-#      if [ ! -e "$realpath"; then
-#	    if echo "$realpath" | grep -q '/openssl_'
-#	      then new_dest="$(echo "$realpath" | sed -e 's,/openssl_,/%{name}_,g')"
-#	      else new_dest="%{name}_$(echo "$realpath" | awk -F '/' '{print $NF}')"
-#	    fi
-#	    if [ ! -e "$new_dest" ]; then
-#		  list_not_e="${list_not_e}\n${new_dest}"
-#		  error=1
-#		fi
-#		rm -fv "$i"
-#		ln -s "$new_dest" "$i"
-#	  fi
-#	done
-#	if [ "$error" != 0 ]; then
-#	  echo "Not existing destinations: ${list_not_e}"
-#	  exit 1
-#	fi
-#  )
-#done
-
-# strip cannot touch these unless 755
-#chmod 755 %{buildroot}%{openssl_engines_dir}/*.so*
-#chmod 755 %{buildroot}%{_libdir}/*.so*
-#chmod 755 %{buildroot}%{_bindir}/*
-
-# Remove devel parts (openssl 1.0 is devel)
-#( cd %{buildroot}
-#  rm -fvr \
-#	./%{_bindir}/c_rehash \
-#	./%{_libdir}/*.so \
-#	./%{_libdir}/*.a \
-#	./%{_includedir} \
-#	./%{_openssldir} \
-#	./%{_libdir}/pkgconfig \
-#	./%{_mandir}/man3 \
-#	./%{_defaultdocdir}/openssl/html/man3
-#)
 install -d %{buildroot}%{_bindir}
 ln -sf %{_optdir}/%{name}/bin/%{oname} %{buildroot}%{_bindir}/%{name}
 
-
 # clean .a
 rm -f %{buildroot}%{_optdir}/%{name}/lib/*.a