[zoneminder] 1.36.1 release add rtspserver submodule

commit 173b631f663aee1d5fd00375753b94faba922ca2 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Fri May 21 15:21:55 2021 -0500 1.36.1 release add rtspserver submodule .gitignore | 3 +++ sources | 5 +++-- zoneminder.spec | 32 ++++++++++++++++++-------------- 3 files changed, 24 insertions(+), 16 deletions(-) --- diff --git a/.gitignore b/.gitignore index 51ac9bd..bc2e208 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ /zoneminder-1.34.23.tar.gz /zoneminder-1.34.24.tar.gz /zoneminder-1.34.26.tar.gz +/crud-3.2.0.tar.gz +/RtspServer-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz +/zoneminder-1.36.1.tar.gz diff --git a/sources b/sources index 4ae774c..89aa8e1 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) = 26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1 -SHA512 (crud-3.1.0-zm.tar.gz) = 03b641454ad070a729e45f592c6c01bf2c80c53f00e085eb48380ba96e88d8c1410b2a0c58607f85d6536375d789b022b9e6b7de5bda8886ec17c3bdb07a68fc -SHA512 (zoneminder-1.34.26.tar.gz) = 9972c6c18e38f700f7834019b08c940d50d29a834f764fd75f83e13cae4ffc80138a45c198d0721049ae3d6f06d5dbac919fc9c7bc436add6040dfbd66ac41fd +SHA512 (crud-3.2.0.tar.gz) = 57e80ced18ab0810941bae43790ba67e399e1299e3c56d3785247195883640ef4e89d1cf0c67f1886cd3ed8f858e88f6af8632b181ce0912dd92c78c53757748 +SHA512 (RtspServer-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz) = 33409d1c5ddf506210e14f35ed59135368cf8ebf7d53b47fd86779d6225d27fa09e1a0a02898d651fecaac103891efb4ad35d4dee3081deb07e2e7a944a70560 +SHA512 (zoneminder-1.36.1.tar.gz) = eb37a0000ff13ba72089a6ca96c097b599d31f24a340f74c0a82f7b10a154deba879bb0b15f9d05401e7eed91f9c891f5a0d2c96e653e1ba50372c80019424ea diff --git a/zoneminder.spec b/zoneminder.spec index 18d25d9..d8ce4a7 100644 --- a/zoneminder.spec +++ b/zoneminder.spec @@ -3,11 +3,14 @@ %global zmgid_final apache # Crud is configured as a git submodule -%global crud_version 3.1.0-zm +%global crud_version 3.2.0 # CakePHP-Enum-Behavior is configured as a git submodule %global ceb_version 1.0-zm +# RtspServer is configured as a git submodule +%global rtspserver_commit cd7fd49becad6010a1b8466bfebbd93999a39878 + %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key @@ -28,11 +31,10 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.34.26 +Version: 1.36.1 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons -# Mootools is under the MIT license: http://mootools.net/ # jQuery is under the MIT license: https://jquery.org/license/ # CakePHP is under the MIT license: https://github.com/cakephp/cakephp # Crud is under the MIT license: https://github.com/FriendsOfCake/crud @@ -40,12 +42,14 @@ Group: System Environment/Daemons # Bootstrap is under the MIT license: https://getbootstrap.com/docs/4.5/about/license/ # Bootstrap-table is under the MIT license: https://bootstrap-table.com/docs/about/license/ # font-awesome is under CC-BY license: https://fontawesome.com/license/free +# RtspServer is under the MIT license: https://github.com/PHZ76/RtspServer/blob/master/LICENSE License: GPLv2+ and LGPLv2+ and MIT URL: http://www.zoneminder.com/ Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zonem... -Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-... +Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/cr... Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version... +Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.tar... %{?rhel:BuildRequires: epel-rpm-macros} BuildRequires: systemd-devel @@ -89,10 +93,6 @@ BuildRequires: zlib-devel BuildRequires: ffmpeg BuildRequires: ffmpeg-devel -# Required for mp4 container support -BuildRequires: libmp4v2-devel -BuildRequires: x264-devel - # Allow existing user base to seamlessly transition to sub-packages Requires: %{name}-common%{?_isa} = %{version}-%{release} Requires: %{name}-httpd%{?_isa} = %{version}-%{release} @@ -202,13 +202,14 @@ gzip -dc %{_sourcedir}/cakephp-enum-behavior-%{ceb_version}.tar.gz | tar -xvvf - rm -rf ./web/api/app/Plugin/CakePHP-Enum-Behavior mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Behavior +gzip -dc %{_sourcedir}/RtspServer-%{rtspserver_commit}.tar.gz | tar -xvvf - +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_UPLOAD_FTP_LOC_DIR %{_localstatedir}/spool/zoneminder-upload ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no -./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no -./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no %build # Disable LTO due to top level asm @@ -349,7 +350,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy %{_bindir}/zmsystemctl.pl -%{_bindir}/zma %{_bindir}/zmaudit.pl %{_bindir}/zmc %{_bindir}/zmcontrol.pl @@ -366,8 +366,10 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %{_bindir}/zmtelemetry.pl %{_bindir}/zmx10.pl %{_bindir}/zmonvif-probe.pl +%{_bindir}/zmonvif-trigger.pl %{_bindir}/zmstats.pl %{_bindir}/zmrecover.pl +%{_bindir}/zm_rtsp_server %{perl_vendorlib}/ZoneMinder* %{perl_vendorlib}/ONVIF* @@ -398,7 +400,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder -%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload %files nginx %config(noreplace) %attr(640,root,nginx) %{_sysconfdir}/zm/zm.conf @@ -422,9 +423,12 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp %dir %attr(755,nginx,nginx) %{_localstatedir}/cache/zoneminder %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder -%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload %changelog +* Fri May 21 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 1.36.1-1 +- 1.36.1 release +- add rtspserver submodule + * Wed Apr 21 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 1.34.26-1 - 1.34.26 Release