Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
This commit is contained in:
commit
53985dcab0
|
@ -4,7 +4,7 @@
|
||||||
%define zmgid_final apache
|
%define zmgid_final apache
|
||||||
|
|
||||||
Name: zoneminder
|
Name: zoneminder
|
||||||
Version: 1.26.4
|
Version: 1.26.5
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A camera monitoring and analysis tool
|
Summary: A camera monitoring and analysis tool
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -139,7 +139,7 @@ fi
|
||||||
#%{_bindir}/zmx10.pl
|
#%{_bindir}/zmx10.pl
|
||||||
|
|
||||||
%{perl_vendorlib}/ZoneMinder*
|
%{perl_vendorlib}/ZoneMinder*
|
||||||
%{perl_vendorlib}/x86_64-linux-thread-multi/auto/ZoneMinder*
|
%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
|
||||||
#%{perl_archlib}/ZoneMinder*
|
#%{perl_archlib}/ZoneMinder*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
%dir %{_libexecdir}/zoneminder
|
%dir %{_libexecdir}/zoneminder
|
||||||
|
@ -160,6 +160,10 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
||||||
|
- This is a bug fixe release
|
||||||
|
- RTSP fixes, cmake enhancements, couple other misc fixes
|
||||||
|
|
||||||
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
||||||
- Initial cmake build.
|
- Initial cmake build.
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
%define zmgid_final apache
|
%define zmgid_final apache
|
||||||
|
|
||||||
Name: zoneminder
|
Name: zoneminder
|
||||||
Version: 1.26.4
|
Version: 1.26.5
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A camera monitoring and analysis tool
|
Summary: A camera monitoring and analysis tool
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -259,6 +259,10 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
||||||
|
- This is a bug fixe release
|
||||||
|
- RTSP fixes, cmake enhancements, couple other misc fixes
|
||||||
|
|
||||||
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
||||||
- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch
|
- 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.
|
- All files are now part of the zoneminder source tree. Update specfile accordingly.
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
%define zmgid_final apache
|
%define zmgid_final apache
|
||||||
|
|
||||||
Name: zoneminder
|
Name: zoneminder
|
||||||
Version: 1.26.4
|
Version: 1.26.5
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A camera monitoring and analysis tool
|
Summary: A camera monitoring and analysis tool
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -136,7 +136,7 @@ rm -rf %{_docdir}/%{name}-%{version}
|
||||||
%{_bindir}/zmx10.pl
|
%{_bindir}/zmx10.pl
|
||||||
|
|
||||||
%{perl_vendorlib}/ZoneMinder*
|
%{perl_vendorlib}/ZoneMinder*
|
||||||
%{perl_vendorlib}/x86_64-linux-thread-multi/auto/ZoneMinder*
|
%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
%dir %{_libexecdir}/%{name}
|
%dir %{_libexecdir}/%{name}
|
||||||
%{_libexecdir}/%{name}/cgi-bin
|
%{_libexecdir}/%{name}/cgi-bin
|
||||||
|
@ -155,6 +155,10 @@ rm -rf %{_docdir}/%{name}-%{version}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
||||||
|
- This is a bug fixe release
|
||||||
|
- RTSP fixes, cmake enhancements, couple other misc fixes
|
||||||
|
|
||||||
* Sat Oct 19 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
* Sat Oct 19 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
||||||
- Streamline the cmake build. Move much code into cmakelist.txt file.
|
- Streamline the cmake build. Move much code into cmakelist.txt file.
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
%define zmgid_final apache
|
%define zmgid_final apache
|
||||||
|
|
||||||
Name: zoneminder
|
Name: zoneminder
|
||||||
Version: 1.26.4
|
Version: 1.26.5
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A camera monitoring and analysis tool
|
Summary: A camera monitoring and analysis tool
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -263,6 +263,10 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
|
||||||
|
- This is a bug fixe release
|
||||||
|
- RTSP fixes, cmake enhancements, couple other misc fixes
|
||||||
|
|
||||||
* Sun Oct 06 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
* Sun Oct 06 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
|
||||||
- All files are now part of the zoneminder source tree. Update specfile accordingly.
|
- All files are now part of the zoneminder source tree. Update specfile accordingly.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue