5:06 p.m.
commit 871f9d245d744d4cdbf8956e347c98769f9ca8d9
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Jan 18 11:05:32 2020 -0600
1.34.0 Release
.gitignore | 1 +
sources | 4 +---
zoneminder.spec | 24 ++++++++++++++++--------
3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4965a72..472c0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/zoneminder-1.32.1.tar.gz
/zoneminder-1.32.2.tar.gz
/zoneminder-1.32.3.tar.gz
+/zoneminder-1.34.0.tar.gz
diff --git a/sources b/sources
index 6d489b3..550809b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz
-86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz
-af8161cc1cfed8710a3c2156f72f9b71 zoneminder-1.32.3.tar.gz
+SHA512 (zoneminder-1.34.0.tar.gz) =
1c1891581411ccf1147a0b31904977e2c0e582157aa742de69a4a0ca4246440187a2ba622a00a006040ef601cc12dca58eb83afc3b7a49d48a749b27e07c4320
diff --git a/zoneminder.spec b/zoneminder.spec
index b8abb40..3451392 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -14,17 +14,22 @@
# This will tell zoneminder's cmake process we are building against a known distro
%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
-# Fedora >= 25 needs apcu backwards compatibility module
-%if 0%{?fedora} >= 25
+# 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
+
# The default for everything but el7 these days
%global _hardened_build 1
Name: zoneminder
-Version: 1.32.3
-Release: 5%{?dist}
+Version: 1.34.0
+Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# Mootools is inder the MIT license: http://mootools.net/
@@ -73,6 +78,7 @@ BuildRequires: libcurl-devel
BuildRequires: libv4l-devel
BuildRequires: desktop-file-utils
BuildRequires: gzip
+BuildRequires: zlib-devel
# ZoneMinder looks for and records the location of the ffmpeg binary during build
BuildRequires: ffmpeg
@@ -104,7 +110,7 @@ Summary: Common files for ZoneMinder, not tied to a specific web
server
Requires: php-mysqli
Requires: php-common
Requires: php-gd
-%{?fedora:Requires: php-json}
+%{?with_php_json:Requires: php-json}
Requires: php-pecl-apcu
%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
Requires: cambozola
@@ -317,7 +323,7 @@ EOF
%files common
%license COPYING
-%doc AUTHORS README.md distros/redhat/readme/README distros/redhat/readme/README.httpd
distros/redhat/readme/README.nginx distros/redhat/readme/README.https
+%doc README.md distros/redhat/readme/README distros/redhat/readme/README.httpd
distros/redhat/readme/README.nginx distros/redhat/readme/README.https
# We want these two folders to have "normal" read permission
# compared to the folder contents
@@ -352,6 +358,7 @@ EOF
%{_bindir}/zmx10.pl
%{_bindir}/zmonvif-probe.pl
%{_bindir}/zmstats.pl
+%{_bindir}/zmrecover.pl
%{perl_vendorlib}/ZoneMinder*
%{perl_vendorlib}/ONVIF*
@@ -377,7 +384,6 @@ EOF
%{_tmpfilesdir}/zoneminder.httpd.tmpfiles.conf
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/images
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
@@ -402,7 +408,6 @@ EOF
%{_tmpfilesdir}/zoneminder.nginx.tmpfiles.conf
%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder
%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/events
-%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/images
%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/sock
%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/swap
%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp
@@ -411,6 +416,9 @@ EOF
%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
%changelog
+* Sat Jan 18 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.0-1
+- 1.34.0 Release
+
* Tue Dec 17 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.32.3-5
- Mass rebuild for x264