[zoneminder/f36] 1.36.25 release
by Andrew Bauer
Summary of changes:
ff647ea... 1.36.25 release (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 8 months
[zoneminder/f37] 1.36.25 release
by Andrew Bauer
Summary of changes:
ff647ea... 1.36.25 release (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 8 months
[zoneminder] 1.36.25 release
by Andrew Bauer
commit ff647ea2e9dd11fe26730e34ba5c8349d2b3cf71
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Sep 4 12:09:04 2022 -0500
1.36.25 release
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4688eb7..7a06379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
/zoneminder-1.36.19.tar.gz
/zoneminder-1.36.21.tar.gz
/zoneminder-1.36.24.tar.gz
+/zoneminder-1.36.25.tar.gz
diff --git a/sources b/sources
index 429d8d9..35f5e95 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.24.tar.gz) = 961e1a05bf3aa3545717896eaa05bdc90bdd78ae36a44560431d69a523fa8e575db6d12894958f7bc81bd4142d094b3f4722f9798519451ec1a39cda71bda4b1
+SHA512 (zoneminder-1.36.25.tar.gz) = b2ba4963efde2a9fa9029f50871f7e620d253b4fd23afd55b19172893dd10587066888b6a420986ca7e19c146a2df7bebf916eb554d3411a9a2f143bdcadef38
diff --git a/zoneminder.spec b/zoneminder.spec
index 125dcf0..f146a53 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -36,8 +36,8 @@
%global _hardened_build 1
Name: zoneminder
-Version: 1.36.24
-Release: 2%{?dist}
+Version: 1.36.25
+Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# jQuery is under the MIT license: https://jquery.org/license/
@@ -432,6 +432,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
+* Sun Sep 04 2022 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.25-1
+- 1.36.25 release
+
* Sun Aug 07 2022 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.24-2
- Add additional php and perl runtime requires
1 year, 8 months
[compat-ffmpeg4] Use standard location for pkgconfig and development libs
by Leigh Scott
commit 0816a6b4e9e985821e1e356b0faba1f0f74ced92
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 18:04:09 2022 +0100
Use standard location for pkgconfig and development libs
compat-ffmpeg4.spec | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/compat-ffmpeg4.spec b/compat-ffmpeg4.spec
index cb42f40..f11e757 100644
--- a/compat-ffmpeg4.spec
+++ b/compat-ffmpeg4.spec
@@ -46,7 +46,7 @@
Summary: Digital VCR and streaming server
Name: compat-ffmpeg4
Version: 4.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
Source0: %{url}/releases/ffmpeg-%{version}.tar.xz
@@ -153,6 +153,8 @@ It is not intended to be used in insecure environment.
Summary: Development package for %{name}
Requires: %{name}%{_isa} = %{version}-%{release}
Requires: pkgconfig
+Conflicts: ffmpeg-devel
+Conflicts: ffmpeg-free-devel
%description devel
FFmpeg is a complete and free Internet live audio and video
@@ -169,7 +171,7 @@ This package contains development files for %{name}
--datadir=%{_datadir}/%{name} \\\
--docdir=%{_docdir}/%{name} \\\
--incdir=%{_includedir}/%{name} \\\
- --libdir=%{_libdir}/%{name} \\\
+ --libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--optflags="%{optflags}" \\\
@@ -309,18 +311,6 @@ sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
%install
%make_install V=1
-#Alternative ffmpeg package move headers into a special directory
-if ! [ %{name} == ffmpeg ] ; then
-mkdir -p %{buildroot}%{_libdir}/%{name}/pkgconfig
-for s in %{buildroot}/%{_libdir}/*.so ; do
- ffmpegsym=`basename ${s}`
- ffmpeglib=`readlink ${s}`
- echo "Symlink $ffmpeglib"
- ln -fs ../${ffmpeglib} \
- %{buildroot}%{_libdir}/%{name}/${ffmpegsym}
-done
-rm -rf %{buildroot}/%{_libdir}/*.so
-fi
rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/
%ldconfig_scriptlets
@@ -335,13 +325,14 @@ rm -rf %{buildroot}/%{_datadir}/compat-ffmpeg4/
%files devel
%doc MAINTAINERS doc/APIchanges doc/*.txt
%{_includedir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/pkgconfig
-%{_libdir}/%{name}/pkgconfig/lib*.pc
-%{_libdir}/%{name}/lib*.so
+%{_libdir}/pkgconfig/lib*.pc
+%{_libdir}/lib*.so
%changelog
+* Sun Sep 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 4.4.2-5
+- Use standard location for pkgconfig and development libs
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
1 year, 8 months
[vlc] Revert "Add requires ffmpeg-libs"
by Leigh Scott
commit acb8dd7eb265d08cff45ef3d753f7fecda712c51
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 13:40:37 2022 +0100
Revert "Add requires ffmpeg-libs"
This reverts commit ba01a0a2d3cd3f2c1a0b909b3222fc42d1551e21.
vlc.spec | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index d47cf8b..0943ad4 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -57,7 +57,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.18
-Release: 0.2.rc%{?dist}
+Release: 0.1.rc%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: https://code.videolan.org/videolan/vlc/-/archive/%{commit0}/vlc-%{shortco...
@@ -299,7 +299,6 @@ Summary: VLC media player core
Provides: vlc-nox = %{epoch}:%{version}-%{release}
%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
%{?lua_version:Requires: lua(abi) = %{lua_version}}
-Requires: ffmpeg-libs%{?_isa}
%description core
VLC media player core components
@@ -604,9 +603,6 @@ fi || :
%changelog
-* Sun Sep 04 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.18-0.2.rc
-- Add requires ffmpeg-libs
-
* Mon Aug 29 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.18-0.1.rc
- Update to 3.0.18-rc
- Drop mmal downstream (rpi) patches
1 year, 8 months
[vlc/f37] Add requires ffmpeg-libs
by Leigh Scott
Summary of changes:
ba01a0a... Add requires ffmpeg-libs (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 8 months
[mpv/f37] Add requires ffmpeg-libs
by Leigh Scott
Summary of changes:
35d0f59... Add requires ffmpeg-libs (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 8 months