From 0bf7b02166e6ba107b9888dffab02a8c4d0e22b9 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Thu, 19 Sep 2019 09:26:17 -0400
Subject: ready for copr build

---
 openssl-freefilesync/openssl.spec                   | 8 ++++----
 openssl-freefilesync/readme-openssl-freefilesync.md | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openssl-freefilesync/openssl.spec b/openssl-freefilesync/openssl.spec
index 6815465..29cef89 100644
--- a/openssl-freefilesync/openssl.spec
+++ b/openssl-freefilesync/openssl.spec
@@ -16,7 +16,6 @@
 # for openssl-freefilesync
 %define fullname openssl-freefilesync
 %define shortname openssl
-%define suffix 111c
 
 # Arches on which we need to prevent arch conflicts on opensslconf.h, must
 # also be handled in opensslconf-new.h.
@@ -411,10 +410,10 @@ export LD_LIBRARY_PATH
 pushd ${RPM_BUILD_ROOT}%{_mandir}
 for word in $( find . ! -type d -print ) ;
 do
-   mv "${word}" "${word}%{suffix}"
+   mv "${word}" "${word}-111c"
 done
 popd
-mv %{RPM_BUILD_ROOT}%{_bindir}/openssl{,%{suffix}}
+mv ${RPM_BUILD_ROOT}%{_bindir}/openssl{,-111c}
 
 %files
 %{!?_licensedir:%global license %%doc}
@@ -422,7 +421,8 @@ mv %{RPM_BUILD_ROOT}%{_bindir}/openssl{,%{suffix}}
 %doc FAQ NEWS README README.FIPS
 %{_bindir}/make-dummy-cert
 %{_bindir}/renew-dummy-cert
-%{_bindir}/openssl%{suffix}
+# for openssl-freefilesync
+%{_bindir}/openssl-111c
 %{_mandir}/man1*/*
 %{_mandir}/man5*/*
 %{_mandir}/man7*/*
diff --git a/openssl-freefilesync/readme-openssl-freefilesync.md b/openssl-freefilesync/readme-openssl-freefilesync.md
index 0523054..b095f14 100644
--- a/openssl-freefilesync/readme-openssl-freefilesync.md
+++ b/openssl-freefilesync/readme-openssl-freefilesync.md
@@ -7,4 +7,6 @@ Take a [Fedora release](https://mirrors.rit.edu/fedora/fedora/linux/updates/30/E
 
     rpm2cpio openssl-1.1.1c-2.fc30.src.rpm | cpio -idm
 
-Make any modifications necessary to get it to compile. This mostly involves reverting any Fedora improvements to rpm specs since CentOS 7 was released, such as `%ldconfig_scriptlets`. Also, make changes to the .cnf file deployments so this package can be installed alongside the regular openssl package in the distro.
+Make any modifications necessary to get it to compile. This changes include:
+* Revert any Fedora improvements to rpm specs since CentOS 7 was released, such as `%ldconfig_scriptlets`
+* Rename cnf and man pages and the main binary so they do not collide with system openssl package
-- 
cgit