[zoneminder] 1.36.1 release add rtspserver submodule
by Andrew Bauer
commit 173b631f663aee1d5fd00375753b94faba922ca2
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
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> - 1.36.1-1
+- 1.36.1 release
+- add rtspserver submodule
+
* Wed Apr 21 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.26-1
- 1.34.26 Release
2 years, 11 months
[xorg-x11-drv-nvidia] Update to 465.31 release
by Leigh Scott
commit 2b983c1f1e7f2fff211685c6e8222190444e4b99
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri May 21 15:39:10 2021 +0100
Update to 465.31 release
sources | 2 +-
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index d7e9685..379b579 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NVIDIA-Linux-x86_64-465.27.run) = 1d43f436b1305faa2981de6ebfa0916d10127005b6cb765ab6bf0d1e75529ec1eab973d0de6e3ebb39678d2b3f80f2ac9a661ed0c4690d8a823ac7822135cdb2
+SHA512 (NVIDIA-Linux-x86_64-465.31.run) = 3ea65eda463320d0e2301e45daa5a725bd07f664ab117053f106b981801ae314faef320304f4b87dd8eb8868f9f86478b23fbca51d27ddc3968a5f5300e8cbf9
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 51d0112..a86cbb5 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -21,7 +21,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
-Version: 465.27
+Version: 465.31
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -527,6 +527,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri May 21 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3:465.31-1
+- Update to 465.31 release
+
* Thu Apr 29 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3:465.27-1
- Update to 465.27 release
2 years, 11 months
[xt7-player-mpv/f34] (4 commits) ...Add BR gambas3-gb-qt5-wayland
by Martin Gansser
Summary of changes:
7ae2acb... Update to 0.33.3152 Add BR gambas3-dev-tools for fc35 (*)
95be04c... Update to 0.33.3152 Add BR gambas3-dev-tools for fc35 (*)
c26b428... Update to 0.33.3152 Add BR gambas3-dev-tools for fc35 Add B (*)
170d359... Add BR gambas3-gb-qt5-wayland (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months
[xt7-player-mpv] Add BR gambas3-gb-qt5-wayland
by Martin Gansser
commit 170d359d75a05549c0d9400187f99fe96bdbf399
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri May 21 16:37:46 2021 +0200
Add BR gambas3-gb-qt5-wayland
xt7-player-mpv.spec | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/xt7-player-mpv.spec b/xt7-player-mpv.spec
index e1b2e30..1e3fa70 100644
--- a/xt7-player-mpv.spec
+++ b/xt7-player-mpv.spec
@@ -7,7 +7,7 @@
Name: xt7-player-mpv
Version: 0.33.3152
#Release: 0.1%%{?gitrelease}%%{?dist}
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: Qt/Gambas gui to mpv media player
License: GPLv3+
URL: http://xt7-player.sourceforge.net/xt7forum/
@@ -22,6 +22,7 @@ BuildRequires: gambas3-devel >= 3.8.4
%else
BuildRequires: gambas3-dev-tools
BuildRequires: gambas3-gb-desktop-x11
+BuildRequires: gambas3-gb-qt5-wayland
%endif
BuildRequires: gambas3-gb-args
BuildRequires: gambas3-gb-compress
@@ -121,10 +122,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_metainfodir}/%{name}*.xml
%changelog
+* Fri May 21 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.33.3152-4
+- Add BR gambas3-gb-qt5-wayland
+
* Thu May 20 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.33.3152-1
- Update to 0.33.3152
-- Add BR gambas3-dev-tools for fc35
-- Add BR: gambas3-gb-desktop-x11 for fc35
+- Add BR gambas3-dev-tools
+- Add BR gambas3-gb-desktop-x11
* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.31.3143-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
2 years, 11 months
[mpd/el8] Update to 0.22.7
by Leigh Scott
Summary of changes:
ed96689... Update to 0.22.7 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 11 months