[zoneminder/f28: 6/6] Merge branch 'master' into f28
commit 19a47ecf6ce9a8fed11db2e7c53b201231a3c93c
Merge: 73f4d84 d06a60f
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Tue Oct 2 08:02:07 2018 -0500
Merge branch 'master' into f28
.gitignore | 1 +
sources | 4 ++++
zoneminder.spec | 11 +++++++++++
3 files changed, 16 insertions(+)
---
diff --cc sources
index c5b1f39,56949e4..ee30735
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,7 @@@
9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz
86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz
++<<<<<<< HEAD
+020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz
++=======
+ 7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz
++>>>>>>> master
diff --cc zoneminder.spec
index 52a0e3c,32f052e..1065c01
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@@ -25,7 -25,7 +25,11 @@@
%global _hardened_build 1
Name: zoneminder
++<<<<<<< HEAD
+Version: 1.32.0
++=======
+ Version: 1.32.1
++>>>>>>> master
Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
@@@ -320,6 -320,10 +324,13 @@@ EO
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder
%changelog
++<<<<<<< HEAD
++=======
+ * Tue Oct 2 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.32.1-1
+ - 1.32.1 release
+ - Bug fix release
+
++>>>>>>> master
* Wed Sep 12 2018 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.32.0-1
- 1.32.0 release
- remove el6 (sys v init) support