diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 62ce44caf1..f6ace411b8 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/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 @@ -18,8 +18,8 @@ %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}} Name: zoneminder -Version: 1.37.63 -Release: 2%{?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/ @@ -40,7 +40,7 @@ Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.t %{?rhel:BuildRequires: epel-rpm-macros} BuildRequires: systemd-devel -BuildRequires: mariadb-connector-c-devel +BuildRequires: mariadb-devel BuildRequires: perl-podlators BuildRequires: polkit-devel BuildRequires: cmake @@ -75,7 +75,6 @@ BuildRequires: libv4l-devel BuildRequires: desktop-file-utils BuildRequires: gzip BuildRequires: zlib-devel -BuildRequires: gsoap-devel # ZoneMinder looks for and records the location of the ffmpeg binary during build BuildRequires: ffmpeg @@ -106,6 +105,7 @@ Requires: php-gd Requires: php-intl Requires: php-process Requires: php-json +Requires: cambozola Requires: php-pecl-apcu Requires: net-tools Requires: psmisc @@ -125,7 +125,6 @@ Requires: perl(LWP::Protocol::https) Requires: perl(Module::Load::Conditional) Requires: ca-certificates Requires: zip -Requires: gsoap %{?systemd_requires} Requires(post): %{_bindir}/gpasswd @@ -197,6 +196,7 @@ rm -rf ./dep/RtspServer mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer # Change the following default values +./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no @@ -208,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 @@ -223,8 +224,6 @@ desktop-file-install \ # Remove unwanted files and folders find %{buildroot} \( -name .htaccess -or -name .editorconfig -or -name .packlist -or -name .git -or -name .gitignore -or -name .gitattributes -or -name .travis.yml \) -type f -delete > /dev/null 2>&1 || : -rm -rf %{buildroot}/usr/include -rm -rf %{buildroot}/usr/cmake # Recursively change shebang in all relevant scripts and set execute permission find %{buildroot}%{_datadir}/zoneminder/www/api \( -name cake -or -name cake.php \) -type f -exec sed -i 's\^#!/usr/bin/env bash$\#!%{_buildshell}\' {} \; -exec %{__chmod} 755 {} \; @@ -337,8 +336,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder %{_unitdir}/zoneminder.service -%{_datadir}/polkit-1/actions/com.zoneminder.* -%{_datadir}/polkit-1/rules.d/com.zoneminder.arp-scan.rules +%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy %{_bindir}/zmsystemctl.pl %{_bindir}/zmaudit.pl @@ -360,7 +358,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %{_bindir}/zmonvif-trigger.pl %{_bindir}/zmstats.pl %{_bindir}/zmrecover.pl -%{_bindir}/zmeventtool.pl %{_bindir}/zm_rtsp_server %{perl_vendorlib}/ZoneMinder* @@ -417,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 - 1.36.34-1 +- 1.36.34 release +- remove el7 support + * Sun Nov 12 2023 Jonathan Bennett - 1.37.47 - Specify folders to remove before packaging