[gstreamer1-libav/f34] bump
by Leigh Scott
commit 1567b300e951e7b620846e05188477aa96fc239d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jun 25 15:58:51 2021 +0100
bump
gstreamer1-libav.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 06579b8..5a95403 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,7 +1,7 @@
Name: gstreamer1-libav
Epoch: 1
Version: 1.18.4
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
@@ -70,7 +70,7 @@ plug-in.
%endif
%changelog
-* Fri Jun 25 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.18.4-1
+* Fri Jun 25 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.18.4-3
- Epoch back to 1.18.4
* Tue Jun 08 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.19.1-1
3 years, 5 months
[gstreamer1-libav/f34] Epoch back to 1.18.4
by Leigh Scott
commit 8b75cf502781574bd29e018f3afadba582b8ff8f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jun 25 15:13:47 2021 +0100
Epoch back to 1.18.4
gstreamer1-libav.spec | 6 +++++-
sources | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index bbb80a1..06579b8 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,5 +1,6 @@
Name: gstreamer1-libav
-Version: 1.19.1
+Epoch: 1
+Version: 1.18.4
Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
License: LGPLv2+
@@ -69,6 +70,9 @@ plug-in.
%endif
%changelog
+* Fri Jun 25 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.18.4-1
+- Epoch back to 1.18.4
+
* Tue Jun 08 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.19.1-1
- Update
diff --git a/sources b/sources
index 1b47723..89920bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0
+SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f
3 years, 5 months
[zoneminder] 1.36.5 release
by Andrew Bauer
Summary of changes:
1f2b5a8... 1.36.5 release (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 5 months
[zoneminder/el7: 3/3] Merge branch 'master' into el7
by Andrew Bauer
commit c5dab5206dfe6a5521879c999212846e6b6a0626
Merge: bb15edb 1f2b5a8
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Fri Jun 25 08:20:25 2021 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder-1.36.4.tar.gz | Bin 11347870 -> 0 bytes
zoneminder.spec | 40 ++++++++++++++++++++++++++--------------
4 files changed, 28 insertions(+), 15 deletions(-)
---
3 years, 5 months
[zoneminder/el8] 1.36.5 release
by Andrew Bauer
Summary of changes:
1f2b5a8... 1.36.5 release (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 5 months
[zoneminder/f34: 2/2] 1.36.5 release
by Andrew Bauer
commit 1f2b5a883ba715f2f24a0921a7e39445688e8b06
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Fri Jun 25 08:19:44 2021 -0500
1.36.5 release
.gitignore | 1 +
sources | 2 +-
zoneminder-1.36.4.tar.gz | Bin 11347870 -> 0 bytes
zoneminder.spec | 44 ++++++++++++++++++++++++++------------------
4 files changed, 28 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2fdcd0b..bb644de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
/RtspServer-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz
/zoneminder-1.36.1.tar.gz
/zoneminder-1.36.3.tar.gz
+/zoneminder-1.36.5.tar.gz
diff --git a/sources b/sources
index 3809f1c..f33f763 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-cd7fd49becad6010a1b8466bfebbd93999a39878.tar.gz) = 33409d1c5ddf506210e14f35ed59135368cf8ebf7d53b47fd86779d6225d27fa09e1a0a02898d651fecaac103891efb4ad35d4dee3081deb07e2e7a944a70560
-SHA512 (zoneminder-1.36.3.tar.gz) = 391beaa3c7281dbd315951471dfd694461e7d6387080d1884d27e3541cfc0a8db3fad4e63cd7a4716202dff7f58451f16e75f958c0189dee9be232a25427b73b
+SHA512 (zoneminder-1.36.5.tar.gz) = 693796820ce52e628f19479eb236d0ba48d3c302d5cafef3eedf60ac6c2d8e53add12638c6d9db22c1ebe18f1092f1504a3d43cdfe627ed72946228a436e01e1
diff --git a/zoneminder.spec b/zoneminder.spec
index b58cb07..8f9d287 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -17,21 +17,26 @@
# This will tell zoneminder's cmake process we are building against a known distro
%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
-# 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
+# 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
+%else
+%global cmake_pkg_name cmake
+%endif
+
# The default for everything but el7 these days
%global _hardened_build 1
Name: zoneminder
-Version: 1.36.4
+Version: 1.36.5
Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
@@ -56,11 +61,7 @@ BuildRequires: systemd-devel
BuildRequires: mariadb-devel
BuildRequires: perl-podlators
BuildRequires: polkit-devel
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: cmake
-%else
-BuildRequires: cmake3
-%endif
+BuildRequires: %{cmake_pkg_name}
BuildRequires: gnutls-devel
BuildRequires: bzip2-devel
BuildRequires: pcre-devel
@@ -120,8 +121,8 @@ Requires: php-mysqli
Requires: php-common
Requires: php-gd
%{?with_php_json:Requires: php-json}
-Requires: php-pecl-apcu
-%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
+%{?fedora:Requires: php-pecl-memcached}
+%{?rhel:Requires: php-pecl-apcu}
Requires: cambozola
Requires: net-tools
Requires: psmisc
@@ -220,16 +221,16 @@ mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer
# See https://fedoraproject.org/wiki/LTOByDefault
%define _lto_cflags %{nil}
-%cmake3 \
+%cmake \
-DZM_WEB_USER="%{zmuid_final}" \
-DZM_WEB_GROUP="%{zmgid_final}" \
-DZM_TARGET_DISTRO="%{zmtargetdistro}" \
.
-%cmake3_build
+%cmake_build
%install
-%cmake3_install
+%cmake_install
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
@@ -429,10 +430,17 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
-* Tue Jun 15 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.4-1
+* Tue Jun 22 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.5-1
+- 1.36.5 release
+
+* Fri Jun 18 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.4-2
+- apcu-bc deprecated on fedora, use memcached instead
+- only refer to cmake3 when building on el7
+
+* Tue Jun 08 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.4-1
- 1.36.4 release
-* Wed Jun 02 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.3-1
+* Sun May 30 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.3-1
- 1.36.3 release
* Fri May 28 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.2-1
3 years, 5 months
[mpd] enable sidplay for el8
by Leigh Scott
commit ade52f8c11986f2fdaba0ec5c4b2e4bfb9cf8a94
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jun 24 13:25:45 2021 +0100
enable sidplay for el8
mpd.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/mpd.spec b/mpd.spec
index fb8c336..a7af9d6 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -150,9 +150,6 @@ sed -i -e 's@sphinx-build@sphinx-build-3@g' doc/meson.build
-Dgme=disabled \
-Dmpcdec=disabled \
-Dshine=disabled \
-%if 0%{?rhel} > 7
- -Dsidplay=disabled \
-%endif
-Dtremor=disabled
%{meson_build}
3 years, 5 months