forked from ZoneMinder/zoneminder
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fix_1762' into storageareas
- Loading branch information
Showing
5 changed files
with
34 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,7 @@ | ||
D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@ | ||
D @ZM_TMPDIR@/logs 0755 @WEB_USER@ @WEB_GROUP@ | ||
D @ZM_TMPDIR@/cache 0755 @WEB_USER@ @WEB_GROUP@ | ||
D @ZM_TMPDIR@/cache/models 0755 @WEB_USER@ @WEB_GROUP@ | ||
D @ZM_TMPDIR@/cache/persistent 0755 @WEB_USER@ @WEB_GROUP@ | ||
D @ZM_TMPDIR@/cache/views 0755 @WEB_USER@ @WEB_GROUP@ | ||
D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ | |
|
||
Name: zoneminder | ||
Version: 1.30.2 | ||
Release: 1%{?dist} | ||
Release: 2%{?dist} | ||
Summary: A camera monitoring and analysis tool | ||
Group: System Environment/Daemons | ||
# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/ | ||
|
@@ -39,7 +39,7 @@ Group: System Environment/Daemons | |
License: GPLv2+ and LGPLv2+ and MIT | ||
URL: http://www.zoneminder.com/ | ||
|
||
Source0: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz | ||
Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zoneminder-%{version}.tar.gz | ||
Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz | ||
|
||
%{?with_init_systemd:BuildRequires: systemd-devel} | ||
|
@@ -130,8 +130,8 @@ designed to support as many cameras as you can attach to your computer without | |
too much degradation of performance. | ||
|
||
%prep | ||
%autosetup | ||
%autosetup -a 1 | ||
%autosetup -n ZoneMinder-%{version} | ||
%autosetup -a 1 -n ZoneMinder-%{version} | ||
rmdir ./web/api/app/Plugin/Crud | ||
mv -f crud-%{crud_version} ./web/api/app/Plugin/Crud | ||
|
||
|
@@ -336,8 +336,11 @@ rm -rf %{_docdir}/%{name}-%{version} | |
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %ghost %{_localstatedir}/run/zoneminder | ||
|
||
%changelog | ||
* Thu Mar 30 2017 Andrew Bauer <[email protected]> - 1.30.2-2 | ||
- 1.30.2 release | ||
|
||
* Wed Feb 08 2017 Andrew Bauer <[email protected]> - 1.30.2-1 | ||
- Bump version for 1.30.2 release | ||
- Bump version for 1.30.2 release candidate 1 | ||
|
||
* Wed Dec 28 2016 Andrew Bauer <[email protected]> - 1.30.1-2 | ||
- Changes from rpmfusion #4393 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters