1:20 p.m.
commit 1f2b5a883ba715f2f24a0921a7e39445688e8b06
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Fri Jun 25 08:19:44 2021 -0500
1.36.5 release
.gitignore | 1 +
sources | 2 +-
zoneminder-1.36.4.tar.gz | Bin 11347870 -> 0 bytes
zoneminder.spec | 44 ++++++++++++++++++++++++++------------------
4 files changed, 28 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2fdcd0b..bb644de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
/RtspServer-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz
/zoneminder-1.36.1.tar.gz
/zoneminder-1.36.3.tar.gz
+/zoneminder-1.36.5.tar.gz
diff --git a/sources b/sources
index 3809f1c..f33f763 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) =
26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1
SHA512 (crud-3.2.0.tar.gz) =
57e80ced18ab0810941bae43790ba67e399e1299e3c56d3785247195883640ef4e89d1cf0c67f1886cd3ed8f858e88f6af8632b181ce0912dd92c78c53757748
SHA512 (RtspServer-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz) =
33409d1c5ddf506210e14f35ed59135368cf8ebf7d53b47fd86779d6225d27fa09e1a0a02898d651fecaac103891efb4ad35d4dee3081deb07e2e7a944a70560
-SHA512 (zoneminder-1.36.3.tar.gz) =
391beaa3c7281dbd315951471dfd694461e7d6387080d1884d27e3541cfc0a8db3fad4e63cd7a4716202dff7f58451f16e75f958c0189dee9be232a25427b73b
+SHA512 (zoneminder-1.36.5.tar.gz) =
693796820ce52e628f19479eb236d0ba48d3c302d5cafef3eedf60ac6c2d8e53add12638c6d9db22c1ebe18f1092f1504a3d43cdfe627ed72946228a436e01e1
diff --git a/zoneminder.spec b/zoneminder.spec
index b58cb07..8f9d287 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -17,21 +17,26 @@
# This will tell zoneminder's cmake process we are building against a known distro
%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
-# Fedora needs apcu backwards compatibility module
-%if 0%{?fedora}
-%global with_apcu_bc 1
-%endif
-
# Newer php's keep json functions in a subpackage
%if 0%{?fedora} || 0%{?rhel} >= 8
%global with_php_json 1
%endif
+# el7 uses cmake3 package and macros
+%if 0%{?rhel} == 7
+%global cmake %{cmake3}
+%global cmake_build %{cmake3_build}
+%global cmake_install %{cmake3_install}
+%global cmake_pkg_name cmake3
+%else
+%global cmake_pkg_name cmake
+%endif
+
# The default for everything but el7 these days
%global _hardened_build 1
Name: zoneminder
-Version: 1.36.4
+Version: 1.36.5
Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
@@ -56,11 +61,7 @@ BuildRequires: systemd-devel
BuildRequires: mariadb-devel
BuildRequires: perl-podlators
BuildRequires: polkit-devel
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: cmake
-%else
-BuildRequires: cmake3
-%endif
+BuildRequires: %{cmake_pkg_name}
BuildRequires: gnutls-devel
BuildRequires: bzip2-devel
BuildRequires: pcre-devel
@@ -120,8 +121,8 @@ Requires: php-mysqli
Requires: php-common
Requires: php-gd
%{?with_php_json:Requires: php-json}
-Requires: php-pecl-apcu
-%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
+%{?fedora:Requires: php-pecl-memcached}
+%{?rhel:Requires: php-pecl-apcu}
Requires: cambozola
Requires: net-tools
Requires: psmisc
@@ -220,16 +221,16 @@ mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer
# See https://fedoraproject.org/wiki/LTOByDefault
%define _lto_cflags %{nil}
-%cmake3 \
+%cmake \
-DZM_WEB_USER="%{zmuid_final}" \
-DZM_WEB_GROUP="%{zmgid_final}" \
-DZM_TARGET_DISTRO="%{zmtargetdistro}" \
.
-%cmake3_build
+%cmake_build
%install
-%cmake3_install
+%cmake_install
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
@@ -429,10 +430,17 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf
%{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
-* Tue Jun 15 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.4-1
+* Tue Jun 22 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.5-1
+- 1.36.5 release
+
+* Fri Jun 18 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.4-2
+- apcu-bc deprecated on fedora, use memcached instead
+- only refer to cmake3 when building on el7
+
+* Tue Jun 08 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.4-1
- 1.36.4 release
-* Wed Jun 02 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.3-1
+* Sun May 30 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.3-1
- 1.36.3 release
* Fri May 28 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.2-1