From 7e9b9944aeff426132b10b57806feac08c80d12d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 15 Apr 2017 08:51:59 -0500 Subject: [PATCH] rpmspecfile changes to reflect recent commits --- distros/fedora | 1 + distros/fedora/README.txt | 3 --- distros/redhat/CMakeLists.txt | 4 +--- distros/redhat/zoneminder.spec | 9 ++------- 4 files changed, 4 insertions(+), 13 deletions(-) create mode 120000 distros/fedora delete mode 100644 distros/fedora/README.txt diff --git a/distros/fedora b/distros/fedora new file mode 120000 index 000000000..4d0827986 --- /dev/null +++ b/distros/fedora @@ -0,0 +1 @@ +redhat \ No newline at end of file diff --git a/distros/fedora/README.txt b/distros/fedora/README.txt deleted file mode 100644 index 09659129f..000000000 --- a/distros/fedora/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Fedora rpm build files have been merged with redhat. -See /distros/redhat. - diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt index 69ed05ff3..63159b1c7 100644 --- a/distros/redhat/CMakeLists.txt +++ b/distros/redhat/CMakeLists.txt @@ -46,7 +46,7 @@ else("${unzip_jsc}" STREQUAL "") endif("${unzip_jsc}" STREQUAL "") # Create several empty folders -file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp logs cache models persistent views) +file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp) # Install the empty folders install(DIRECTORY sock swap DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) @@ -54,8 +54,6 @@ install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WR install(DIRECTORY zoneminder DESTINATION /var/run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(DIRECTORY zoneminder-upload DESTINATION /var/spool DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY logs cache DESTINATION /var/lib/zoneminder/temp DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY models persistent views DESTINATION /var/lib/zoneminder/temp/cache DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) # Create symlinks install(CODE "execute_process(COMMAND ln -sf ../../../../var/lib/zoneminder/events \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/events\")") diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 6fe589949..0984ba4f9 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -86,6 +86,8 @@ BuildRequires: polkit-devel Requires: php-mysqli Requires: php-common Requires: php-gd +%{?fedora:Requires: php-pecl-apcu-bc} +%{?rhel:Requires: php-pecl-apcu} Requires: cambozola Requires: net-tools Requires: psmisc @@ -335,13 +337,6 @@ rm -rf %{_docdir}/%{name}-%{version} %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder -# cakephp requires its cache folders to pre-exist -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp/logs -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp/cache -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp/cache/views -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp/cache/models -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp/cache/persistent - %changelog * Thu Mar 30 2017 Andrew Bauer - 1.30.2-2 - 1.30.2 release