Commit Graph

128 Commits

Author SHA1 Message Date
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor f33b127e7e add curl dependencies 2014-07-11 10:51:12 -04:00
whopperg 4a070f93bb Update rules
There was a missing tab-indent. So dpkg-buildpackage under debian didnt work:

Error:
debian/rules:77: *** missing separator.  Stop.
2014-07-06 11:48:41 +02:00
Isaac Connor e2987067f4 add avtools instead of ffmpg 2014-06-26 13:09:52 -04:00
Isaac Connor 0f4e9eb3e4 add these dependencies, apparently they are required for sftp upload 2014-06-17 10:54:42 -04:00
Isaac Connor a73e367d5e add libav-tools as an option instead of ffmpeg 2014-06-04 11:21:43 -04:00
Kfir Itzhak 7aef6e9389 Merge pull request #387 from PX03AFK/patch-4
Update zoneminder.cmake.OS13.spec - minor corrections
2014-04-25 11:06:35 +03:00
Kfir Itzhak c64b1318db Merge pull request #389 from PX03AFK/patch-6
Update README.OpenSuse
2014-04-25 11:05:37 +03:00
David Wilcox ca2b6f36f5 Update README.OpenSuse
Additional info on amending database if using version which has /tmp as work space
2014-04-17 15:44:44 -04:00
David Wilcox 103dc0c00d Update CMakeLists.txt
Adds named variables to ease change in the future
2014-04-17 15:42:37 -04:00
David Wilcox ee7fe5bfaa Update zoneminder.cmake.OS13.spec
Correct requires for cpanm and make as they should be post
change cpanm call to be full path name
correct permissions on events, images and temp
2014-04-17 15:41:04 -04:00
David Wilcox 5cd165e9d5 Update zoneminder.tmpfiles
Incorrect directory
2014-04-03 22:16:38 -04:00
Isaac Connor 3212974bdf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-03-28 10:12:39 -04:00
Andrew Bauer dda1034927 Merge pull request #362 from PX03AFK/patch-2
Update zoneminder.cmake.OS13.spec
2014-03-27 17:58:27 -05:00
David Wilcox c4645de0e6 Update zoneminder.cmake.OS13.spec 2014-03-26 23:06:42 -04:00
David Wilcox a7a5f5d543 Update README.OpenSuse 2014-03-26 23:05:20 -04:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO'
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
2014-03-20 16:48:03 -04:00
Andrew Bauer e0f8583110 Merge pull request #348 from PX03AFK/opensuse
Initial upload for opensuse rpm
2014-03-19 12:09:53 -05:00
root 43b259c5cd Initial upload for opensuse rpm 2014-03-18 23:31:58 -04:00
Kyle Johnson 75d390d70a Merge branch 'release-1.27' 2014-03-15 00:51:13 -04:00
Andrew Bauer f8f0ec57dc further refinement of build requirements 2014-03-14 06:56:05 -05:00
Andrew Bauer 9f616c0d2b Make httpd both an install and build requirement 2014-03-12 06:58:53 -05:00
Andrew Bauer f9fab8d487 Need to make httpd a build requirement for cmake builds so the apache user can be properly auto-detected 2014-03-11 20:38:51 -05:00
Andrew Bauer a5d1f2afb7 Create a hardened build per Fedora packaging guidelines 2014-03-11 19:01:32 -05:00
Andrew Bauer 16c59f7cb0 Update README.Fedora
typo
2014-03-08 14:04:40 -06:00
Andrew Bauer bc4630fddc Update local_zoneminder.te
Changes based on forum feedback
2014-02-22 15:39:10 -06:00
Andrew Bauer 4f2b09a36d remove noreplace flag on zm.conf in spec file 2014-02-01 19:30:23 -06:00
Andrew Bauer d87682e5aa Edit vlc requirements in spec files 2014-02-01 17:49:04 -06:00
Andrew Bauer 647cf5b180 update Fedora & CentOS README's 2014-02-01 16:39:33 -06:00
Andrew Bauer 4088f9bc00 Add libcurl requirement to rpm spec files 2014-02-01 15:01:36 -06:00
Andrew Bauer 22b54dd046 Bump spec files revision to 1.27 2014-02-01 12:24:30 -06:00
Andrew Bauer 23144606dc Merge pull request #318 from ZoneMinder/zmcamtool
zmcamtool.pl - import and export ptz camera controls & camera presets
2014-01-29 07:34:40 -08:00
Andrew Bauer 52794e4dad Add vlc-devel to rpm build requirements 2014-01-26 14:02:06 -06:00
Andrew Bauer f00e72be1e Initial commit for new zmcamtool.pl script 2014-01-21 16:22:30 -06:00
Kyle Johnson 6534aa546c Fixed readme.debian fstab bind examples
After receiving a bug report that the examples did not work, I tried them myself.  They did not work, so I updated them to something that does work.
2014-01-02 08:24:58 -05:00
Andrew Bauer ab06878b7b Update zoneminder.cmake.f19.spec
Add BuildRequires perl(Sys::Syslog) to successfully build with mock
2014-01-01 15:03:12 -06:00
Dmitry Katsubo e745bbf14e No need to redefine RUNDIR and ZM_RUNDIR, as they already depend on DESTDIR. 2013-12-30 15:32:06 +01:00
Dmitry Katsubo 7bf0bcf4ef Updated package version (otherwise build process stops). 2013-12-30 15:31:50 +01:00
Andrew Bauer dbd2ee348e define variables to toggle x10 & ffmpeg support 2013-12-23 19:41:00 -06:00
Andrew Bauer c4d22672ac Specfile changes related to zmfix 2013-12-23 17:06:31 -06:00
nkwood f4d6d99ab2 Update zoneminder.f19.spec 2013-12-23 15:09:12 -06:00
nkwood 4a89c8d5e9 Update zoneminder.el6.spec 2013-12-23 15:08:19 -06:00
nkwood f12dd88e5d Update zoneminder.cmake.f19.spec 2013-12-23 15:06:38 -06:00
nkwood 8e7d89024f Update zoneminder.cmake.el6.spec 2013-12-23 15:05:11 -06:00
nkwood 942b9c65da Update init.d 2013-12-23 15:01:21 -06:00
nkwood 922385d761 Update init.d 2013-12-23 14:55:56 -06:00
Andrew Bauer 45385526d7 Update README.CentOS
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
2013-12-21 09:45:40 -06:00
Andrew Bauer db2398d1ba Update README.Fedora
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
2013-12-21 09:45:21 -06:00
Isaac Connor 7064141161 check for mysql existence first. 2013-12-17 13:13:45 -05:00
Andrew Bauer 43b8990d73 Update zoneminder.el6.spec
Bump revision and changelog
2013-12-16 14:46:28 -06:00