From bdbe3345767f14d0934874b258614d89adaf1b78 Mon Sep 17 00:00:00 2001 From: spanner3003 Date: Mon, 16 Apr 2018 19:52:05 +0100 Subject: [PATCH 1/4] Fix travis build status (#2077) * Fix travis build status * Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b9a90f9c..3bdf1ffd1 100644 --- a/README.md +++ b/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 From 08447de7ca4c94f2a15d09340f7fe4cc27e32bae Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 17 Apr 2018 14:53:55 -0500 Subject: [PATCH 2/4] bump rpm specfile version --- distros/redhat/zoneminder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 0226d777f..b3e1e89e8 100644 --- a/distros/redhat/zoneminder.spec +++ b/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 From 3a80c60d2e8283c09be147ec6aed66314e366f9a Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Tue, 17 Apr 2018 15:13:38 -0500 Subject: [PATCH 3/4] rpm spefile changes - account for new files --- distros/redhat/zoneminder.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index b3e1e89e8..15d586846 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -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 From 17fbb4902580fd6b079400ab7edc11c63ff89f4e Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 17 Apr 2018 15:50:30 -0500 Subject: [PATCH 4/4] cannot assign categories when type=link RPM packaging calls the freedesktop tool "desktop-file-install", which fails with: ``` error: key "Categories" is present in group "Desktop Entry", but the type is "Link" while this key is only valid for type "Application" ``` @connortechnology This fails the build so I'm removing the categories. Let me know if you've got any other ideas. --- misc/zoneminder.desktop.in | 1 - 1 file changed, 1 deletion(-) diff --git a/misc/zoneminder.desktop.in b/misc/zoneminder.desktop.in index fd7f247d8..675dc62c5 100755 --- a/misc/zoneminder.desktop.in +++ b/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;