Commit Graph

586 Commits

Author SHA1 Message Date
Isaac Connor d5ad757116 Merge branch 'master' into feature-h264-videostorage 2017-01-02 10:00:02 -05:00
klemens 0d549f1db3 spelling fixes 2016-12-29 10:31:05 +01:00
Andrew Bauer 76db2e811d more rpm specfile changes 2016-12-28 09:27:30 -06:00
Andrew Bauer ea0cfad37c update rpm specfile 2016-12-27 09:06:50 -06:00
Andrew Bauer 56277bce09 minor rpm specfile changes 2016-12-26 10:07:38 -06:00
Andrew Bauer 0d1dbf1745 fix rpm specfile versioning in changelog 2016-12-26 09:31:11 -06:00
Andrew Bauer 0dd6f4916e rpm specfile - move tmpfile config under /usr/lib 2016-12-26 08:31:21 -06:00
Andrew Bauer eb0b85ec13 changes based on feedback from rpmlint 2016-12-23 14:02:39 -06:00
Andrew Bauer 3d15ac315b Update CMakeLists.txt
minor whitespace change
2016-12-23 13:11:06 -06:00
Andrew Bauer 1b81d790b2 rpm specfile consolidation 2016-12-23 13:06:44 -06:00
Isaac Connor f6c377c2b4 Merge branch 'master' into feature-h264-videostorage 2016-12-15 16:47:32 -05:00
Andrew Bauer 68cd4c2ce5 Update zoneminder.el7.spec
minor specfile change
2016-12-15 08:28:37 -06:00
Andrew Bauer 6fe88adc02 Update zoneminder.f25.spec 2016-12-12 20:50:53 -06:00
Andrew Bauer e72a76fe33 Update control 2016-12-12 12:09:47 -06:00
Andy Bauer 9a694541ba repm specfile maintenance: retire fc23, add fc25 2016-11-26 08:20:03 -06:00
Andy Bauer bf85791e4c improvements to fedora nginx rpm support 2016-11-22 13:02:02 -06:00
Andy Bauer c2b1638a3e rpm changes - set TZ var in systemd service file 2016-11-22 12:43:56 -06:00
Andy Bauer a96ab604ec rpm changes - set TZ var in systemd service file 2016-11-22 12:42:48 -06:00
Andrew Bauer 71898df756 Merge pull request #1697 from connortechnology/apache_indexes
Apache indexes
2016-11-22 12:33:55 -06:00
Isaac Connor aa0a4d1f5a put back mizzing F 2016-11-22 13:13:09 -05:00
Andrew Bauer b67450b8ae Update zoneminder.php-fpm.conf.in 2016-11-17 19:48:35 -06:00
Andrew Bauer bcc5a57b02 prelimniary support for nginx on fedora 2016-11-15 18:34:25 -06:00
Isaac Connor 6361f14387 Rremove Index from options to prevent directory listings 2016-11-08 09:30:24 -05:00
Isaac Connor a7979eb63b Merge branch 'master' into feature-h264-videostorage 2016-10-03 13:21:50 -04:00
Isaac Connor 603d903297 add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line 2016-09-29 14:24:49 -04:00
Isaac Connor 3dfe1185ff add ffmpeg as option to libav-tols 2016-09-13 10:11:50 -04:00
Isaac Connor fb35f5c48a Merge ../ZoneMinder.master into feature-h264-videostorage 2016-08-31 10:58:19 -04:00
Andy Bauer 4895942308 update fedora rpm readme 2016-08-16 09:49:45 -05:00
Isaac Connor 1058796374 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:04:35 -04:00
Isaac Connor bdcc53d309 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:04:10 -04:00
Isaac Connor c1d2407ed3 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:02:15 -04:00
Steve Gilvarry 5d8159462c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-11 00:51:46 +10:00
Isaac Connor 6b70ff964b fix path in cake api cleanup rules 2016-08-10 09:06:15 -04:00
Andrew Bauer 6c8001f362 Merge pull request #1549 from SteveGilvarry/initd_sql_wait
Implement suggested wait for MySQL start
2016-08-06 09:14:58 -05:00
Steve Gilvarry ea1ae815f1 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-05 23:03:06 +10:00
Andrew Bauer 004b651d61 RPM specfile config change
use make macros, rather than hard coded values
2016-07-31 15:06:39 -05:00
Andrew Bauer 3c6692d0d5 RPM specfile config change
fix logrotate script
2016-07-31 07:29:37 -05:00
Steve Gilvarry 3543c37f5e Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
2016-07-31 08:24:52 +10:00
Andrew Bauer 477c02382b Update CMakeLists.txt
Minor change for fedora rpmbuild
2016-07-06 19:06:28 -05:00
Andrew Bauer 1f060f1938 Update zoneminder.init
Remove my initials
2016-07-05 11:35:08 -05:00
Steve Gilvarry 1f53377d8a Implement suggested wait for MySQL start 2016-07-05 07:28:52 +10:00
Andy Bauer 980d3f6e7f rpm housecleaning, change the way jscalendar is installed 2016-07-03 11:34:35 -05:00
Andrew Bauer f3583e5707 rpm specfile - add support for f24, remove support for f22 2016-06-24 15:39:57 -05:00
Andy Bauer 58e1a9ac4a rpm README changes 2016-06-01 07:30:41 -05:00
Disassembler 8eee25795a Remove deprecated register_globals from Apache/PHP configs 2016-05-30 14:02:46 +02:00
Isaac Connor 09e4aca0be add libdata-uuid-perl to debian/ubuntu dependencies 2016-05-17 09:26:36 -04:00
Isaac Connor 4d20d35f8d add back missing depends for perl modules which are needed both for building and installing 2016-05-10 08:43:38 -04:00
Isaac Connor 5566d1881d add perl dbd mysql to build depends. Seems to need it. 2016-05-09 21:34:12 -04:00
Steve Gilvarry 97a4cf0852 Add the changes...doh 2016-05-01 15:06:45 +10:00
Steve Gilvarry d7f7a0f074 Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
2016-05-01 13:46:09 +10:00