From 49e4d1089adbd34231fb42750990791861660ca0 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 16 Dec 2013 14:42:22 -0600 Subject: [PATCH 1/6] Update zoneminder.cmake.el6.spec Bugfix. Perl path was hardcoded to x86_64. Use macro instead. --- distros/redhat/zoneminder.cmake.el6.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.cmake.el6.spec b/distros/redhat/zoneminder.cmake.el6.spec index 73d5bf682..4b323a81f 100644 --- a/distros/redhat/zoneminder.cmake.el6.spec +++ b/distros/redhat/zoneminder.cmake.el6.spec @@ -136,7 +136,7 @@ rm -rf %{_docdir}/%{name}-%{version} %{_bindir}/zmx10.pl %{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/x86_64-linux-thread-multi/auto/ZoneMinder* +%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder* %{_mandir}/man*/* %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/cgi-bin From 570606f01f5cbc2b766de0674e144d0d4a11643c Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 16 Dec 2013 14:43:33 -0600 Subject: [PATCH 2/6] Update zoneminder.cmake.f19.spec Bugfix. Perl path had x86_64 hardcoded. Use macro instead. --- distros/fedora/zoneminder.cmake.f19.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/fedora/zoneminder.cmake.f19.spec b/distros/fedora/zoneminder.cmake.f19.spec index 19056a361..92adbf43b 100644 --- a/distros/fedora/zoneminder.cmake.f19.spec +++ b/distros/fedora/zoneminder.cmake.f19.spec @@ -139,7 +139,7 @@ fi #%{_bindir}/zmx10.pl %{perl_vendorlib}/ZoneMinder* -%{perl_vendorlib}/x86_64-linux-thread-multi/auto/ZoneMinder* +%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder* #%{perl_archlib}/ZoneMinder* %{_mandir}/man*/* %dir %{_libexecdir}/zoneminder From 3ce3df8645734f310f66f91a40533defdcbc932b Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 16 Dec 2013 14:44:22 -0600 Subject: [PATCH 3/6] Update zoneminder.cmake.f19.spec Bump revision and changelog --- distros/fedora/zoneminder.cmake.f19.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distros/fedora/zoneminder.cmake.f19.spec b/distros/fedora/zoneminder.cmake.f19.spec index 92adbf43b..a73902aa7 100644 --- a/distros/fedora/zoneminder.cmake.f19.spec +++ b/distros/fedora/zoneminder.cmake.f19.spec @@ -4,7 +4,7 @@ %define zmgid_final apache Name: zoneminder -Version: 1.26.4 +Version: 1.26.5 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -160,6 +160,10 @@ fi %changelog +* Mon Dec 16 2013 Andrew Bauer - 1.26.5 +- This is a bug fixe release +- RTSP fixes, cmake enhancements, couple other misc fixes + * Mon Oct 07 2013 Andrew Bauer - 1.26.4 - Initial cmake build. From 0f14db811d48ab62e398f80f348e83286bbcad66 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 16 Dec 2013 14:45:11 -0600 Subject: [PATCH 4/6] Update zoneminder.f19.spec Bump revision and changelog --- distros/fedora/zoneminder.f19.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distros/fedora/zoneminder.f19.spec b/distros/fedora/zoneminder.f19.spec index 906646568..2cf2d6028 100644 --- a/distros/fedora/zoneminder.f19.spec +++ b/distros/fedora/zoneminder.f19.spec @@ -8,7 +8,7 @@ %define zmgid_final apache Name: zoneminder -Version: 1.26.4 +Version: 1.26.5 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -259,6 +259,10 @@ fi %changelog +* Mon Dec 16 2013 Andrew Bauer - 1.26.5 +- This is a bug fixe release +- RTSP fixes, cmake enhancements, couple other misc fixes + * Sat Oct 05 2013 Andrew Bauer - 1.26.4 - Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch - All files are now part of the zoneminder source tree. Update specfile accordingly. From 2ca23bf07add1ade37d1f2eb0fc01fd0056cff2d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 16 Dec 2013 14:45:50 -0600 Subject: [PATCH 5/6] Update zoneminder.cmake.el6.spec Bump revision and changelog --- distros/redhat/zoneminder.cmake.el6.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.cmake.el6.spec b/distros/redhat/zoneminder.cmake.el6.spec index 4b323a81f..6eff3aec8 100644 --- a/distros/redhat/zoneminder.cmake.el6.spec +++ b/distros/redhat/zoneminder.cmake.el6.spec @@ -4,7 +4,7 @@ %define zmgid_final apache Name: zoneminder -Version: 1.26.4 +Version: 1.26.5 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -155,6 +155,10 @@ rm -rf %{_docdir}/%{name}-%{version} %changelog +* Mon Dec 16 2013 Andrew Bauer - 1.26.5 +- This is a bug fixe release +- RTSP fixes, cmake enhancements, couple other misc fixes + * Sat Oct 19 2013 Andrew Bauer - 1.26.4 - Streamline the cmake build. Move much code into cmakelist.txt file. From 43b8990d736b22a455bdbebdb9842acd91db7420 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 16 Dec 2013 14:46:28 -0600 Subject: [PATCH 6/6] Update zoneminder.el6.spec Bump revision and changelog --- distros/redhat/zoneminder.el6.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec index 72449cb1d..58ceff443 100644 --- a/distros/redhat/zoneminder.el6.spec +++ b/distros/redhat/zoneminder.el6.spec @@ -8,7 +8,7 @@ %define zmgid_final apache Name: zoneminder -Version: 1.26.4 +Version: 1.26.5 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons @@ -263,6 +263,10 @@ fi %changelog +* Mon Dec 16 2013 Andrew Bauer - 1.26.5 +- This is a bug fixe release +- RTSP fixes, cmake enhancements, couple other misc fixes + * Sun Oct 06 2013 Andrew Bauer - 1.26.4 - All files are now part of the zoneminder source tree. Update specfile accordingly.