From 563e673bee74053a39557a991b37e6079ffff423 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 1 Sep 2018 11:53:56 -0500 Subject: [PATCH] rpm - rename README.xxx to README for all builds --- distros/redhat/CMakeLists.txt | 9 +++++++-- distros/redhat/zoneminder.spec | 6 ++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index 683a475b1..d940942c1 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMakeLists.txt for the Redhat/CentOS Target Distro. +# CMakeLists.txt for the Redhat Target Distros. # Display a message to show the RHEL build options are being processed. if(ZM_TARGET_DISTRO MATCHES "^el") @@ -20,11 +20,16 @@ if(ZM_WEB_USER STREQUAL "nginx") configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY) configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY) - configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README.Fedora COPYONLY) + configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY) else(ZM_WEB_USER STREQUAL "nginx") configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY) configure_file(apache/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY) configure_file(systemd/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY) + if( ZM_TARGET_DISTRO MATCHES "^fc") + configure_file(readme/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY) + else( ZM_TARGET_DISTRO MATCHES "^fc") + configure_file(readme/README.Redhat7 ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY) + endif( ZM_TARGET_DISTRO MATCHES "^fc") endif(ZM_WEB_USER STREQUAL "nginx") # Create several empty folders diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index a91a3a78e..d619f3662 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -22,7 +22,6 @@ %global with_apcu_bc 1 %endif -%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora} %global _hardened_build 1 Name: zoneminder @@ -203,8 +202,7 @@ fi %{_bindir}/gpasswd -a %{zmuid_final} dialout >/dev/null 2>&1 || : # Warn the end user to read the README file -echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.%{readme_suffix} to finish the\ninstallation or upgrade!\n" -echo -e "\nThe README file is located here: %{_docdir}/%{name}\n" +echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read %{_docdir}/README\nto finish the installation or upgrade!\n" %if 0%{?with_nginx} # Nginx does not create an SSL certificate like the apache package does so lets do that here @@ -252,7 +250,7 @@ EOF %files %license COPYING -%doc AUTHORS README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https +%doc AUTHORS README.md distros/redhat/README distros/redhat/readme/README.https # We want these two folders to have "normal" read permission # compared to the folder contents