Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

README.md

@@ -1,7 +1,7 @@
 ZoneMinder
 ==========
 
-[![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png)](https://travis-ci.org/ZoneMinder/ZoneMinder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
+[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 
 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 

distros/redhat/zoneminder.spec

@@ -33,7 +33,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.31.1
+Version: 1.31.41
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -82,6 +82,7 @@ BuildRequires: vlc-devel
 BuildRequires: libcurl-devel
 BuildRequires: libv4l-devel
 BuildRequires: ffmpeg-devel
+BuildRequires:	desktop-file-utils
 
 # Required for mp4 container support
 BuildRequires: libmp4v2-devel
@@ -167,6 +168,12 @@ too much degradation of performance.
 %install
 %make_install
 
+desktop-file-install					\
+	--dir %{buildroot}%{_datadir}/applications	\
+	--delete-original				\
+	--mode 644					\
+	%{buildroot}%{_datadir}/applications/zoneminder.desktop
+
 # Remove unwanted files and folders
 find %{buildroot} \( -name .htaccess -or -name .editorconfig -or -name .packlist -or -name .git -or -name .gitignore -or -name .gitattributes -or -name .travis.yml \) -type f -delete > /dev/null 2>&1 || :
 
@@ -341,6 +348,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_bindir}/zmtelemetry.pl
 %{_bindir}/zmx10.pl
 %{_bindir}/zmonvif-probe.pl
+%{_bindir}/zmstats.pl
 
 %{perl_vendorlib}/ZoneMinder*
 %{perl_vendorlib}/ONVIF*
@@ -351,6 +359,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 
 %{_libexecdir}/zoneminder/
 %{_datadir}/zoneminder/
+%{_datadir}/applications/*%{name}.desktop
 
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events

misc/zoneminder.desktop.in

@@ -5,4 +5,3 @@ Name=ZoneMinder
 Comment=
 Icon=@PKGDATADIR@/icons/16x16/icon.xpm
 URL=http://localhost/zm/\r
-Categories=GNOME;AudioVideo;Video;Recorder;