commit 86a88529c5957ffacb7d7b59137f01da36e3ad26 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Fri Aug 16 07:58:13 2024 -0500 1.36.34 release remove el7 support .gitignore | 2 ++ sources | 4 ++-- zoneminder.spec | 39 ++++++++++++--------------------------- 3 files changed, 16 insertions(+), 29 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4fbad71..15f52af 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ /zoneminder-1.36.31.tar.gz /zoneminder-1.36.32.tar.gz /zoneminder-1.36.33.tar.gz +/RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz +/zoneminder-1.36.34.tar.gz diff --git a/sources b/sources index daeca15..25af4b3 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-eab32851421ffe54fec0229c3efc44c642bc8d46.tar.gz) = 245012f634b6039f819ac2fb512313797dd514e160a9d0dbfd7e03e8d957b73846746ce5b5575341628a3e7aac0085891f01bb1d0e709b804ffaf27541e76f53 -SHA512 (zoneminder-1.36.33.tar.gz) = 7afd25d3fa5dd170bad552332dab5425b664e41d430f1514f2b038ec7391dae6fab165050b541cad50a6904341f77605fde845cc02e4d7ee10f42650cb9e8707 +SHA512 (RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 2f3bbd449269cba5afda3135e54cca114342956da3ce8fbfb05533ec7b1c3f75767d8b5f3d9b415254ad7b39817bc343b0790c591ef3cc64d2863819ab3a7551 +SHA512 (zoneminder-1.36.34.tar.gz) = f1428505ed2924f6e2e58d37b10e2028347e6c6ee99692b7c014b4d54660b7f6df719c1bef2028a185b3854c548eeb984b97df6242017091451792cc57c2ccff diff --git a/zoneminder.spec b/zoneminder.spec index 61b61bd..5a107a7 100644 --- a/zoneminder.spec +++ b/zoneminder.spec @@ -9,7 +9,7 @@ %global ceb_version 1.0-zm # RtspServer is configured as a git submodule -%global rtspserver_commit eab32851421ffe54fec0229c3efc44c642bc8d46 +%global rtspserver_commit 055d81fe1293429e496b19104a9ed3360755a440 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key @@ -17,29 +17,9 @@ # This will tell zoneminder's cmake process we are building against a known distro %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}} -# 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 -%global mariadevel mariadb-devel -%else -%global cmake_pkg_name cmake -%global mariadevel mariadb-connector-c-devel -%endif - -# The default for everything but el7 these days -%global _hardened_build 1 - Name: zoneminder -Version: 1.36.33 -Release: 7%{?dist} +Version: 1.36.34 +Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons # jQuery is under the MIT license: https://jquery.org/license/ @@ -60,10 +40,10 @@ Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.t %{?rhel:BuildRequires: epel-rpm-macros} BuildRequires: systemd-devel -BuildRequires: %{mariadevel} +BuildRequires: mariadb-devel BuildRequires: perl-podlators BuildRequires: polkit-devel -BuildRequires: %{cmake_pkg_name} +BuildRequires: cmake BuildRequires: gnutls-devel BuildRequires: bzip2-devel BuildRequires: pcre-devel @@ -124,7 +104,7 @@ Requires: php-common Requires: php-gd Requires: php-intl Requires: php-process -%{?with_php_json:Requires: php-json} +Requires: php-json Requires: cambozola Requires: php-pecl-apcu Requires: net-tools @@ -228,7 +208,8 @@ mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer %cmake \ -DZM_WEB_USER="%{zmuid_final}" \ -DZM_WEB_GROUP="%{zmgid_final}" \ - -DZM_TARGET_DISTRO="%{zmtargetdistro}" + -DZM_TARGET_DISTRO="%{zmtargetdistro}" \ + . %cmake_build @@ -433,6 +414,10 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder %changelog +* Fri Aug 16 2024 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 1.36.34-1 +- 1.36.34 release +- remove el7 support + * Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.36.33-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild