[qmplay2] Update to 17.07.25
by Martin Gansser
commit 54931bb320d84b0dd75801bcaa979bd3699ff312
Author: martinkg(a)fedoraproject.org <martinkg(a)fedoraproject.org>
Date: Wed Jul 26 08:15:53 2017 +0200
Update to 17.07.25
.gitignore | 1 +
qmplay2.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d10a8d4..fcd5c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/QMPlay2-src-17.04.02.tar.xz
/QMPlay2-src-17.04.21.tar.xz
/QMPlay2-src-17.06.09.tar.xz
+/QMPlay2-src-17.07.25.tar.xz
diff --git a/qmplay2.spec b/qmplay2.spec
index 1ce0fe1..5192328 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -1,7 +1,7 @@
%global pname QMPlay2
Name: qmplay2
-Version: 17.06.09
+Version: 17.07.25
Release: 1%{?dist}
Summary: A Qt based media player, streamer and downloader
License: LGPLv3+
@@ -135,6 +135,9 @@ fi
%{_includedir}/%{pname}
%changelog
+* Wed Jul 26 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.07.25-1
+- Update to 17.07.25
+
* Sat Jun 10 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.06.09-1
- Update to 17.06.09
diff --git a/sources b/sources
index 6cca1af..012401d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecdb256a6ccf0e9741abd82890a297ca QMPlay2-src-17.06.09.tar.xz
+bb629375d8536663a5db17716ca1f71f QMPlay2-src-17.07.25.tar.xz
6 years, 9 months
[zoneminder/f25] initial import
by Andrew Bauer
Summary of changes:
308efcd... initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months
[zoneminder/el7] initial import
by Andrew Bauer
Summary of changes:
308efcd... initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months
[zoneminder/f26] initial import
by Andrew Bauer
Summary of changes:
308efcd... initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months
[vlc] Rebuilt
by Nicolas Chauvet
commit bb30a5d5ec7c853a6bba461a8fd7ef4d9fc95984
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jul 25 14:55:01 2017 +0200
Rebuilt
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 147e281..6e45fba 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -39,7 +39,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.31%{?vlc_date:.git%{vlc_date}}%{?dist}
+Release: 0.32%{?vlc_date:.git%{vlc_date}}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -551,6 +551,9 @@ fi || :
%changelog
+* Tue Jul 25 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.32.git20170717
+- Rebuilt for live555
+
* Mon Jul 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.31.git20170717
- Update snapshot
6 years, 9 months
[zoneminder] initial import
by Andrew Bauer
commit 308efcd3d456c98963ad3ad3209cb44fc770bd5d
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Jul 23 15:16:28 2017 -0500
initial import
.gitignore | 2 +
sources | 2 +
zoneminder-apacheconfig.patch | 137 ++++++++
zoneminder-distropatternmatch.patch | 67 ++++
zoneminder-ftbsf27.patch | 54 ++++
zoneminder.spec | 609 ++++++++++++++++++++++++++++++++++++
6 files changed, 871 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..24450c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/crud-3.0.10.tar.gz
+/zoneminder-1.30.4.tar.gz
diff --git a/sources b/sources
index e69de29..3a4df62 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+155f67c0f2a0e49415d7e82c83215e7d crud-3.0.10.tar.gz
+d51536977324da8ec5de65efef467203 zoneminder-1.30.4.tar.gz
diff --git a/zoneminder-apacheconfig.patch b/zoneminder-apacheconfig.patch
new file mode 100644
index 0000000..b789b1f
--- /dev/null
+++ b/zoneminder-apacheconfig.patch
@@ -0,0 +1,137 @@
+From c294e25dbc327834e93f5efb26cdf719f194fa20 Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting(a)outlook.com>
+Date: Fri, 14 Jul 2017 07:23:35 -0500
+Subject: [PATCH] rpm packaging - migrate cakephp htaccess parms into main
+ apache config
+
+---
+ distros/redhat/systemd/zoneminder.conf.in | 29 ++++++++++++++-
+ distros/redhat/sysvinit/zoneminder.conf.in | 59 ++++++++++++++++++++++++++----
+ 2 files changed, 78 insertions(+), 10 deletions(-)
+
+diff --git a/distros/redhat/systemd/zoneminder.conf.in b/distros/redhat/systemd/zoneminder.conf.in
+index 005c959a6..0e546f9df 100644
+--- a/distros/redhat/systemd/zoneminder.conf.in
++++ b/distros/redhat/systemd/zoneminder.conf.in
+@@ -16,7 +16,7 @@ Alias /zm "@ZM_WEBDIR@"
+ DirectoryIndex index.php
+ SSLRequireSSL
+ Options -Indexes +MultiViews +FollowSymLinks
+- AllowOverride All
++ AllowOverride None
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ Require all granted
+@@ -31,7 +31,7 @@ Alias /zm "@ZM_WEBDIR@"
+ ScriptAlias /cgi-bin-zm "@ZM_CGIDIR@"
+ <Directory "@ZM_CGIDIR@">
+ SSLRequireSSL
+- AllowOverride All
++ AllowOverride None
+ Options +ExecCGI +FollowSymLinks
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+@@ -44,3 +44,28 @@ ScriptAlias /cgi-bin-zm "@ZM_CGIDIR@"
+ </IfModule>
+ </Directory>
+
++# For better visibility, the following directives have been migrated from the
++# default .htaccess files included with the CakePHP project.
++# Parameters not set here are inherited from the parent directive above.
++<Directory "@ZM_WEBDIR@/api">
++ RewriteEngine on
++ RewriteRule ^$ app/webroot/ [L]
++ RewriteRule (.*) app/webroot/$1 [L]
++ RewriteBase /zm/api
++</Directory>
++
++<Directory "@ZM_WEBDIR@/api/app">
++ RewriteEngine on
++ RewriteRule ^$ webroot/ [L]
++ RewriteRule (.*) webroot/$1 [L]
++ RewriteBase /zm/api
++</Directory>
++
++<Directory "@ZM_WEBDIR@/api/app/webroot">
++ RewriteEngine On
++ RewriteCond %{REQUEST_FILENAME} !-d
++ RewriteCond %{REQUEST_FILENAME} !-f
++ RewriteRule ^ index.php [L]
++ RewriteBase /zm/api
++</Directory>
++
+diff --git a/distros/redhat/sysvinit/zoneminder.conf.in b/distros/redhat/sysvinit/zoneminder.conf.in
+index 413910214..0e546f9df 100644
+--- a/distros/redhat/sysvinit/zoneminder.conf.in
++++ b/distros/redhat/sysvinit/zoneminder.conf.in
+@@ -11,18 +11,61 @@ RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]
+
+ Alias /zm "@ZM_WEBDIR@"
+ <Directory "@ZM_WEBDIR@">
++ # explicitly set index.php as the only directoryindex
++ DirectoryIndex disabled
++ DirectoryIndex index.php
+ SSLRequireSSL
+- Options -Indexes MultiViews FollowSymLinks
+- AllowOverride All
+- Order allow,deny
+- Allow from all
++ Options -Indexes +MultiViews +FollowSymLinks
++ AllowOverride None
++ <IfModule mod_authz_core.c>
++ # Apache 2.4
++ Require all granted
++ </IfModule>
++ <IfModule !mod_authz_core.c>
++ # Apache 2.2
++ Order deny,allow
++ Allow from all
++ </IfModule>
+ </Directory>
+
+ ScriptAlias /cgi-bin/zm "@ZM_CGIDIR@"
+ <Directory "@ZM_CGIDIR@">
+ SSLRequireSSL
+- AllowOverride All
+- Options ExecCGI FollowSymLinks
+- Order allow,deny
+- Allow from all
++ AllowOverride None
++ Options +ExecCGI +FollowSymLinks
++ <IfModule mod_authz_core.c>
++ # Apache 2.4
++ Require all granted
++ </IfModule>
++ <IfModule !mod_authz_core.c>
++ # Apache 2.2
++ Order deny,allow
++ Allow from all
++ </IfModule>
+ </Directory>
++
++# For better visibility, the following directives have been migrated from the
++# default .htaccess files included with the CakePHP project.
++# Parameters not set here are inherited from the parent directive above.
++<Directory "@ZM_WEBDIR@/api">
++ RewriteEngine on
++ RewriteRule ^$ app/webroot/ [L]
++ RewriteRule (.*) app/webroot/$1 [L]
++ RewriteBase /zm/api
++</Directory>
++
++<Directory "@ZM_WEBDIR@/api/app">
++ RewriteEngine on
++ RewriteRule ^$ webroot/ [L]
++ RewriteRule (.*) webroot/$1 [L]
++ RewriteBase /zm/api
++</Directory>
++
++<Directory "@ZM_WEBDIR@/api/app/webroot">
++ RewriteEngine On
++ RewriteCond %{REQUEST_FILENAME} !-d
++ RewriteCond %{REQUEST_FILENAME} !-f
++ RewriteRule ^ index.php [L]
++ RewriteBase /zm/api
++</Directory>
++
+
diff --git a/zoneminder-distropatternmatch.patch b/zoneminder-distropatternmatch.patch
new file mode 100644
index 0000000..e4a47d2
--- /dev/null
+++ b/zoneminder-distropatternmatch.patch
@@ -0,0 +1,67 @@
+--- a/CMakeLists.txt 2017-05-09 09:54:48.000000000 -0500
++++ b/CMakeLists.txt 2017-06-13 17:45:26.224997743 -0500
+@@ -150,30 +150,18 @@
+ "Build ZoneMinder for a specific distribution. Currently, valid names are: fc24, fc25, el6, el7, OS13, FreeBSD")
+
+ # Reassign some variables if a target distro has been specified
+-if((ZM_TARGET_DISTRO STREQUAL "fc24") OR (ZM_TARGET_DISTRO STREQUAL "fc25"))
+- set(ZM_RUNDIR "/var/run/zoneminder")
+- set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
+- set(ZM_TMPDIR "/var/lib/zoneminder/temp")
+- set(ZM_LOGDIR "/var/log/zoneminder")
+- set(ZM_CONFIG_DIR "/etc/zm")
+- set(ZM_WEBDIR "/usr/share/zoneminder/www")
+- set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
+-elseif(ZM_TARGET_DISTRO STREQUAL "el6")
+- set(ZM_RUNDIR "/var/run/zoneminder")
+- set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
+- set(ZM_TMPDIR "/var/lib/zoneminder/temp")
+- set(ZM_LOGDIR "/var/log/zoneminder")
+- set(ZM_CONFIG_DIR "/etc/zm")
+- set(ZM_WEBDIR "/usr/share/zoneminder/www")
+- set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
+-elseif(ZM_TARGET_DISTRO STREQUAL "el7")
++if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+ set(ZM_RUNDIR "/var/run/zoneminder")
+ set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
+ set(ZM_TMPDIR "/var/lib/zoneminder/temp")
+ set(ZM_LOGDIR "/var/log/zoneminder")
+ set(ZM_CONFIG_DIR "/etc/zm")
++ set(ZM_CONFIG_SUBDIR "/etc/zm/conf.d")
+ set(ZM_WEBDIR "/usr/share/zoneminder/www")
+ set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
++ set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
++ set(ZM_DIR_IMAGES "/var/lib/zoneminder/images")
++ set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
+ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
+ set(ZM_RUNDIR "/var/run/zoneminder")
+ set(ZM_TMPDIR "/var/run/zoneminder")
+@@ -191,10 +179,11 @@
+ set(ZM_WEB_USER "www")
+ set(ZM_WEB_GROUP "www")
+ set(ZM_CONFIG_DIR "/usr/local/etc/zm")
++ set(ZM_CONFIG_SUBDIR "/usr/local/etc/zm/conf.d")
+ set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
+ set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
+ set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
+-endif((ZM_TARGET_DISTRO STREQUAL "fc24") OR (ZM_TARGET_DISTRO STREQUAL "fc25"))
++endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+
+ # Required for certain checks to work
+ set(CMAKE_EXTRA_INCLUDE_FILES
+@@ -709,13 +698,11 @@
+ endif(ZM_ONVIF)
+
+ # Process distro subdirectories
+-if((ZM_TARGET_DISTRO STREQUAL "fc24") OR (ZM_TARGET_DISTRO STREQUAL "fc25"))
+- add_subdirectory(distros/redhat)
+-elseif((ZM_TARGET_DISTRO STREQUAL "el6") OR (ZM_TARGET_DISTRO STREQUAL "el7"))
++if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+ add_subdirectory(distros/redhat)
+ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
+ add_subdirectory(distros/opensuse)
+-endif((ZM_TARGET_DISTRO STREQUAL "fc24") OR (ZM_TARGET_DISTRO STREQUAL "fc25"))
++endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+
+ # Print optional libraries detection status
+ message(STATUS "Optional libraries found:${optlibsfound}")
diff --git a/zoneminder-ftbsf27.patch b/zoneminder-ftbsf27.patch
new file mode 100644
index 0000000..8827337
--- /dev/null
+++ b/zoneminder-ftbsf27.patch
@@ -0,0 +1,54 @@
+From 38ce8dab6184df31b0b20c2ae6a2dc26bc0bc10a Mon Sep 17 00:00:00 2001
+From: Andy Bauer <knnniggett(a)hotmail.com>
+Date: Tue, 13 Jun 2017 13:14:37 -0500
+Subject: [PATCH] move include <sys/uio.h> outside defined(BSD) block
+
+---
+ src/zm_comms.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zm_comms.h b/src/zm_comms.h
+index cf108c1ea..ae5fd5b08 100644
+--- a/src/zm_comms.h
++++ b/src/zm_comms.h
+@@ -30,9 +30,9 @@
+
+ #include <set>
+ #include <vector>
++#include <sys/uio.h>
+
+ #if defined(BSD)
+-#include <sys/uio.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #endif
+
+---
+From 97380f009b0e6a8bb6ee4ecbf0436045342cdf1e Mon Sep 17 00:00:00 2001
+From: abishai <abi(a)abinet.ru>
+Date: Tue, 31 Jan 2017 10:42:57 +0300
+Subject: [PATCH] implement platform-agnostic comparison without abs()
+
+---
+ src/zm_image.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/zm_image.cpp b/src/zm_image.cpp
+index 9c8c12fda..80a821376 100644
+--- a/src/zm_image.cpp
++++ b/src/zm_image.cpp
+@@ -1658,11 +1658,9 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
+ {
+ uint8_t *psrc = images[j]->buffer+c;
+
+-#ifndef SOLARIS
+- if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+-#else
+- if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+-#endif
++ unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);
++
++ if (diff >= RGB_VAL(threshold,c))
+ {
+ count++;
+ }
diff --git a/zoneminder.spec b/zoneminder.spec
new file mode 100644
index 0000000..96159cc
--- /dev/null
+++ b/zoneminder.spec
@@ -0,0 +1,609 @@
+%global zmuid_final apache
+%global zmgid_final apache
+
+# Crud is configured as a git submodule
+%global crud_version 3.0.10
+
+%if "%{zmuid_final}" == "nginx"
+%global with_nginx 1
+%global wwwconfdir %{_sysconfdir}/nginx/default.d
+%else
+%global wwwconfdir %{_sysconfdir}/httpd/conf.d
+%endif
+
+%global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
+%global sslkey %{_sysconfdir}/pki/tls/private/localhost.key
+
+# This will tell zoneminder's cmake process we are building against a known distro
+%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
+
+# Fedora >= 25 needs apcu backwards compatibility module
+%if 0%{?fedora} >= 25
+%global with_apcu_bc 1
+%endif
+
+# Include files for SysV init or systemd
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%global with_init_systemd 1
+%else
+%global with_init_sysv 1
+%endif
+
+%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora}
+%global _hardened_build 1
+
+Name: zoneminder
+Version: 1.30.4
+Release: 3%{?dist}
+Summary: A camera monitoring and analysis tool
+Group: System Environment/Daemons
+# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
+# Mootools is inder the MIT license: http://mootools.net/
+# CakePHP is under the MIT license: https://github.com/cakephp/cakephp
+# Crud is under the MIT license: https://github.com/FriendsOfCake/crud
+License: GPLv2+ and LGPLv2+ and MIT
+URL: http://www.zoneminder.com/
+
+Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zonem...
+Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/cr...
+
+Patch0: zoneminder-ftbsf27.patch
+Patch1: zoneminder-distropatternmatch.patch
+Patch2: zoneminder-apacheconfig.patch
+
+%{?with_init_systemd:BuildRequires: systemd-devel}
+%{?with_init_systemd:BuildRequires: mariadb-devel}
+%{?with_init_systemd:BuildRequires: perl-podlators}
+%{?with_init_sysv:BuildRequires: mysql-devel}
+%{?el6:BuildRequires: epel-rpm-macros}
+BuildRequires: cmake >= 2.8.7
+BuildRequires: gnutls-devel
+BuildRequires: bzip2-devel
+BuildRequires: pcre-devel
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: findutils
+BuildRequires: coreutils
+BuildRequires: perl
+BuildRequires: perl-generators
+BuildRequires: perl(Archive::Tar)
+BuildRequires: perl(Archive::Zip)
+BuildRequires: perl(Date::Manip)
+BuildRequires: perl(DBD::mysql)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(LWP::UserAgent)
+BuildRequires: perl(MIME::Entity)
+BuildRequires: perl(MIME::Lite)
+BuildRequires: perl(PHP::Serialization)
+BuildRequires: perl(Sys::Mmap)
+BuildRequires: perl(Time::HiRes)
+BuildRequires: perl(Net::SFTP::Foreign)
+BuildRequires: perl(Expect)
+BuildRequires: perl(Sys::Syslog)
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: vlc-devel
+BuildRequires: libcurl-devel
+BuildRequires: libv4l-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: polkit-devel
+
+%{?with_nginx:Requires: nginx}
+%{?with_nginx:Requires: fcgiwrap}
+%{?with_nginx:Requires: php-fpm}
+%{!?with_nginx:Requires: httpd}
+%{!?with_nginx:Requires: php}
+Requires: php-mysqli
+Requires: php-common
+Requires: php-gd
+Requires: php-pecl-apcu
+%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
+Requires: cambozola
+Requires: net-tools
+Requires: psmisc
+Requires: polkit
+Requires: libjpeg-turbo
+Requires: vlc-core
+Requires: ffmpeg
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(DBD::mysql)
+Requires: perl(Archive::Tar)
+Requires: perl(Archive::Zip)
+Requires: perl(MIME::Entity)
+Requires: perl(MIME::Lite)
+Requires: perl(Net::SMTP)
+Requires: perl(Net::FTP)
+Requires: perl(LWP::Protocol::https)
+Requires: ca-certificates
+
+%{?with_init_systemd:Requires(post): systemd}
+%{?with_init_systemd:Requires(post): systemd-sysv}
+%{?with_init_systemd:Requires(preun): systemd}
+%{?with_init_systemd:Requires(postun): systemd}
+
+%{?with_init_sysv:Requires(post): /sbin/chkconfig}
+%{?with_init_sysv:Requires(post): %{_bindir}/checkmodule}
+%{?with_init_sysv:Requires(post): %{_bindir}/semodule_package}
+%{?with_init_sysv:Requires(post): %{_sbindir}/semodule}
+%{?with_init_sysv:Requires(preun): /sbin/chkconfig}
+%{?with_init_sysv:Requires(preun): /sbin/service}
+%{?with_init_sysv:Requires(preun): %{_sbindir}/semodule}
+%{?with_init_sysv:Requires(postun): /sbin/service}
+
+Requires(post): %{_bindir}/gpasswd
+Requires(post): %{_bindir}/less
+
+%description
+ZoneMinder is a set of applications which is intended to provide a complete
+solution allowing you to capture, analyze, record and monitor any cameras you
+have attached to a Linux based machine. It is designed to run on kernels which
+support the Video For Linux (V4L) interface and has been tested with cameras
+attached to BTTV cards, various USB cameras and IP network cameras. It is
+designed to support as many cameras as you can attach to your computer without
+too much degradation of performance.
+
+%prep
+%autosetup -p 1 -a 1 -n ZoneMinder-%{version}
+%{__rm} -rf ./web/api/app/Plugin/Crud
+%{__mv} -f crud-%{crud_version} ./web/api/app/Plugin/Crud
+
+# Change the following default values
+./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms
+./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
+./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
+./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR %{_localstatedir}/spool/zoneminder-upload
+./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
+./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
+./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
+./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
+
+%build
+%cmake \
+ -DZM_WEB_USER="%{zmuid_final}" \
+ -DZM_WEB_GROUP="%{zmuid_final}" \
+ -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
+ .
+
+%make_build
+
+%install
+%make_install
+
+# 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 || :
+
+# Recursively change shebang in all relevant scripts and set execute permission
+find %{buildroot}%{_datadir}/zoneminder/www/api \( -name cake -or -name cake.php \) -type f -exec sed -i 's\^#!/usr/bin/env bash$\#!/usr/bin/bash\' {} \; -exec %{__chmod} 755 {} \;
+
+# Use the system cacert file rather then the one bundled with CakePHP
+%{__rm} -f %{buildroot}%{_datadir}/zoneminder/www/api/lib/Cake/Config/cacert.pem
+%{__ln_s} ../../../../../../../..%{_sysconfdir}/pki/tls/certs/ca-bundle.crt %{buildroot}%{_datadir}/zoneminder/www/api/lib/Cake/Config/cacert.pem
+
+%post
+%if 0%{?with_init_sysv}
+/sbin/chkconfig --add zoneminder
+/sbin/chkconfig zoneminder on
+
+# Create and load zoneminder selinux policy module
+echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n"
+%{_bindir}/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null 2>&1 || :
+%{_bindir}/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null 2>&1 || :
+%{_sbindir}/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null 2>&1 || :
+
+%endif
+
+%if 0%{?with_init_systemd}
+# Initial installation
+if [ $1 -eq 1 ] ; then
+ %systemd_post %{name}.service
+fi
+%endif
+
+# Upgrade from a previous version of zoneminder
+if [ $1 -eq 2 ] ; then
+
+ # Add any new PTZ control configurations to the database (will not overwrite)
+ %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || :
+
+ # Freshen the database
+ %{_bindir}/zmupdate.pl -f >/dev/null 2>&1 || :
+
+ # We can't run this automatically when new sql account permissions need to
+ # be manually added first
+ # Run zmupdate non-interactively
+ # zmupdate.pl --nointeractive
+fi
+
+# Allow zoneminder access to local video sources, serial ports, and x10
+%{_bindir}/gpasswd -a %{zmuid_final} video >/dev/null 2>&1 || :
+%{_bindir}/gpasswd -a %{zmuid_final} dialout >/dev/null 2>&1 || :
+
+# Warn the end user to read the README file
+echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.%{readme_suffix} to finish the\ninstallation or upgrade!\n"
+echo -e "\nThe README file is located here: %{_docdir}/%{name}\n"
+
+%if 0%{?with_nginx}
+# Nginx does not create an SSL certificate like the apache package does so lets do that here
+if [ -f %{sslkey} -o -f %{sslcert} ]; then
+ exit 0
+fi
+
+umask 077
+%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null
+
+FQDN=`hostname`
+# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
+if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
+ FQDN=localhost.localdomain
+fi
+
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
+ -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
+ -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+%endif
+
+%preun
+%if 0%{?with_init_sysv}
+if [ $1 -eq 0 ]; then
+ /sbin/service zoneminder stop > /dev/null 2>&1 || :
+ /sbin/chkconfig --del zoneminder
+ echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n"
+ %{_sbindir}/semodule -r local_zoneminder.pp
+fi
+%endif
+
+%if 0%{?with_init_systemd}
+%systemd_preun %{name}.service
+%endif
+
+%postun
+%if 0%{?with_init_sysv}
+if [ $1 -ge 1 ]; then
+ /sbin/service zoneminder condrestart > /dev/null 2>&1 || :
+fi
+
+# Remove the doc folder.
+rm -rf %{_docdir}/%{name}-%{version}
+%endif
+
+%if 0%{?with_init_systemd}
+%systemd_postun_with_restart %{name}.service
+%endif
+
+%if 0%{?with_init_systemd}
+%triggerun -- zoneminder < 1.25.0-4
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zoneminder
+# to migrate them to systemd targets
+%{_bindir}/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
+/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+%endif
+
+%files
+%license COPYING
+%doc AUTHORS README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https distros/redhat/jscalendar-doc
+%config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/zm.conf
+%config(noreplace) %attr(644,root,root) %{wwwconfdir}/zoneminder.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
+
+%if 0%{?with_nginx}
+%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf
+%endif
+
+%if 0%{?with_init_systemd}
+%{_tmpfilesdir}/zoneminder.conf
+%{_unitdir}/zoneminder.service
+%endif
+
+%if 0%{?with_init_sysv}
+%doc distros/redhat/misc/local_zoneminder.te
+%attr(755,root,root) %{_initrddir}/zoneminder
+%endif
+
+%{_bindir}/zma
+%{_bindir}/zmaudit.pl
+%{_bindir}/zmc
+%{_bindir}/zmcontrol.pl
+%{_bindir}/zmdc.pl
+%{_bindir}/zmf
+%{_bindir}/zmfilter.pl
+%{_bindir}/zmpkg.pl
+%{_bindir}/zmtrack.pl
+%{_bindir}/zmtrigger.pl
+%{_bindir}/zmu
+%{_bindir}/zmupdate.pl
+%{_bindir}/zmvideo.pl
+%{_bindir}/zmwatch.pl
+%{_bindir}/zmcamtool.pl
+%{_bindir}/zmsystemctl.pl
+%{_bindir}/zmtelemetry.pl
+%{_bindir}/zmx10.pl
+%{_bindir}/zmonvif-probe.pl
+
+%{perl_vendorlib}/ZoneMinder*
+%{perl_vendorlib}/ONVIF*
+%{perl_vendorlib}/WSDiscovery*
+%{perl_vendorlib}/WSSecurity*
+%{perl_vendorlib}/WSNotification*
+%{_mandir}/man*/*
+
+%{_libexecdir}/zoneminder/
+%{_datadir}/zoneminder/
+
+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
+
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder
+
+%changelog
+* Fri Jul 14 2017 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.4-3
+- changes from Jul 12 feedback rpmfusion #4393
+
+* Tue Jun 13 2017 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.4-2
+- patch to fix ftbs on f27
+
+* Tue May 09 2017 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.4-1
+- modify autosetup macro parameters
+- modify requirements for php-pecl-acpu-bc package
+- 1.30.4 release
+
+* Tue May 02 2017 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.3-1
+- 1.30.3 release
+
+* Thu Mar 30 2017 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.2-2
+- 1.30.2 release
+
+* Wed Feb 08 2017 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.2-1
+- Bump version for 1.30.2 release candidate 1
+
+* Wed Dec 28 2016 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.1-2
+- Changes from rpmfusion #4393
+
+* Fri Dec 23 2016 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.30.1-1
+- Consolidate fedora/centos spec files
+- Add preliminary nginx support
+- New contact email
+
+* Thu Mar 3 2016 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.30.0-1
+- Bump version fo 1.30.0 release.
+
+* Sat Nov 21 2015 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.29.0-1
+- Bump version for 1.29.0 release on Fedora 23.
+
+* Sat Feb 14 2015 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.28.1-1
+- Bump version for 1.28.1 release on Fedora 21.
+
+* Sun Oct 5 2014 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.28.0-1
+- Bump version for 1.28.0 release.
+
+* Fri Mar 14 2014 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.27-1
+- Tweak build requirements for cmake
+
+* Sat Feb 01 2014 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.27-1
+- Add zmcamtool.pl. Bump version for 1.27 release.
+
+* Mon Dec 16 2013 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.26.5-1
+- This is a bug fixe release
+- RTSP fixes, cmake enhancements, couple other misc fixes
+
+* Mon Oct 07 2013 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.26.4-1
+- Initial cmake build.
+
+* Sat Oct 05 2013 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.26.4-1
+- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch
+- All files are now part of the zoneminder source tree. Update specfile accordingly.
+
+* Sat Sep 21 2013 Andrew Bauer <knnniggett(a)users.sourceforge.net> - 1.26.3-1
+- Initial rebuild for ZoneMinder 1.26.3 release.
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.25.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Mon Jan 7 2013 Remi Collet <rcollet(a)redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
+- rebuild against new libjpeg
+
+* Thu Aug 09 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-9
+- Add patch to work around v4l2 api breakage in 3.5 kernel.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.25.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 23 2012 Petr Pisar <ppisar(a)redhat.com> - 1.25.0-7
+- Perl 5.16 rebuild
+
+* Wed Mar 21 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-6
+- Fix stupid thinko in sql modifications.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-4
+- Convert to systemd.
+- Add tmpfiles.d configuration since the initscript isn't around to create
+ /run/zoneminder.
+- Remove some pointless executable permissions.
+- Add logrotate file.
+
+* Wed Feb 22 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-3
+- Update README.Fedora to reference systemctl and mention timezone info in
+ php.ini.
+- Add proper default for EYEZM_LOG_TO_FILE.
+
+
+* Thu Feb 09 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-2
+- Rebuild for new pcre.
+
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.25.0-1
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.24.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.4-3
+- Re-add the dist-tag that somehow got lost.
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.4-2
+- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+- Undo that patch, and undo another which was the cause of the whole mess.
+- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+- Make sure database creation mods actually take.
+- Update Fedora-specific docs with some additional info.
+- Use bundled mootools (javascript, so no guideline violation).
+- Update download location.
+- Update the gcrypt patch to actually work.
+- Upstream changed the tarball without changing the version to patch a
+ vulnerability, so redownload.
+
+* Sun Aug 14 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.4-1
+- Initial attempt to upgrade to 1.24.4.
+- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
+ gnutls openssl libs.
+
+* Thu Jul 21 2011 Petr Sabata <contyk(a)redhat.com> - 1.24.3-7.20110324svn3310
+- Perl mass rebuild
+
+* Wed Jul 20 2011 Petr Sabata <contyk(a)redhat.com> - 1.24.3-6.20110324svn3310
+- Perl mass rebuild
+
+* Mon May 09 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.3-5.20110324svn3310
+- Bump for gnutls update.
+
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion. Turns out that what upstream was calling
+ 1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
+* Wed Mar 23 2011 Dan Horák <dan(a)danny.cz> - 1.24.3-3
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.24.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.2-6
+- Unbundle cambozola; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
+- Git rid of mixed space/tab usage by removing all tabs.
+- Remove unnecessary Conflicts: line.
+- Attempt to force short_open_tag on for the code directories.
+- Move default location of sockets, swaps, logfiles and some temporary files to
+ make more sense and allow things to work better with a future selinux policy.
+- Fix errors in README.Fedora.
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 1.24.2-5
+- Mass rebuild with perl-5.12.0
+
+* Fri Dec 4 2009 Stepan Kasal <skasal(a)redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.24.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
+* Sat Apr 11 2009 Martin Ebourne <martin(a)zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
+* Sat Apr 11 2009 Martin Ebourne <martin(a)zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
+* Sat Mar 21 2009 Martin Ebourne <martin(a)zepler.org> - 1.24.1-1
+- Patch for gcc 4.4 compilation errors
+- Upgrade to 1.24.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.23.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caolán McNamara <caolanm(a)redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
+* Mon Dec 15 2008 Martin Ebourne <martin(a)zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
+* Fri Jul 11 2008 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.23.3-1
+- Initial attempt at packaging 1.23.
+
+* Tue Jul 1 2008 Martin Ebourne <martin(a)zepler.org> - 1.22.3-15
+- Add perl module compat dependency, bz #453590
+
+* Tue May 6 2008 Martin Ebourne <martin(a)zepler.org> - 1.22.3-14
+- Remove default runlevel, bz #441315
+
+* Mon Apr 28 2008 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 1.22.3-13
+- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.22.3-12
+- Autorebuild for GCC 4.3
+
+* Thu Jan 3 2008 Martin Ebourne <martin(a)zepler.org> - 1.22.3-11
+- Fix compilation on gcc 4.3
+
+* Thu Dec 6 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-10
+- Rebuild for new openssl
+
+* Thu Aug 2 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-8
+- Fix licence tag
+
+* Thu Jul 12 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-7
+- Fixes from testing by Jitz including missing dependencies and database creation
+
+* Sat Jun 30 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-6
+- Disable crashtrace on ppc
+
+* Sat Jun 30 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-5
+- Fix uid for directories in /var/lib/zoneminder
+
+* Tue Jun 26 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-4
+- Added perl Archive::Tar dependency
+- Disabled web interface due to lack of access control on the event images
+
+* Sun Jun 10 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-3
+- Changes recommended in review by Jason Tibbitts
+
+* Mon Apr 2 2007 Martin Ebourne <martin(a)zepler.org> - 1.22.3-2
+- Standardised on package name of zoneminder
+
+* Thu Dec 28 2006 Martin Ebourne <martin(a)zepler.org> - 1.22.3-1
+- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
6 years, 9 months
[live555] update to 2017.07.18
by Alexandre Detiste
commit 12297cf9df875795aef726fe25419096ac65d965
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Tue Jul 25 13:22:37 2017 +0200
update to 2017.07.18
live555.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/live555.spec b/live555.spec
index 5ed2f3e..3ead7ca 100644
--- a/live555.spec
+++ b/live555.spec
@@ -1,5 +1,5 @@
Name: live555
-Version: 2017.06.04
+Version: 2017.07.18
Release: 1%{?dist}
Summary: Live555.com streaming libraries
@@ -118,6 +118,9 @@ chmod +x %{buildroot}%{_libdir}/*.so*
%changelog
+* Tue Jul 25 2017 Alexandre Detiste <alexandre(a)detiste.be> - 2017.07.18-1
+- Update to 2017.07.18
+
* Sun Jul 16 2017 Alexandre Detiste <alexandre(a)detiste.be> - 2017.06.04-1
- New release
- Use sed to out include of obsolete 'xlocale.h'
diff --git a/sources b/sources
index e14cf0e..606a1a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a36bb3cb9d7b6908ecb6efd48090be4f live.2017.06.04.tar.gz
+890ee3a3ea7a1df5843df9f9429170d7 live.2017.07.18.tar.gz
6 years, 9 months
[xorg-x11-drv-nvidia] (81 commits) Non-fast-forward update to branch f25
by Nicolas Chauvet
The branch 'f25' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:
http://live.gnome.org/Git/Help/NonFastForward
Commits removed from the branch:
039843e... Clean up more libglvnd provided libs
2320fc5... fix merge
4c2f268... Merge branch 'master' into f25
61a8770... Merge branch 'master' into f25
27c7cc2... Merge branch 'master' into f25
14f0dcc... Merge branch 'master' into f25
8295212... Fix file conflict with filesystem
dc51e40... Merge branch 'master' into f25
f63d823... Move mesa-*gl* requires to -libs
e0c9a56... Enable boolean dependency to fix 32bit installation when ne
3e44442... Bump cuda-drivers release to 100
286375c... Update to 375.39 release
f4ea70c... Merge branch 'master' into f25
77b2faa... Implement cuda-libs (for steam)
fd9df17... Drop GFXPAYLOAD and video=vesa:off
67b680c... Avoid xorg dir symlink
c405bd2... Update changelog
2fea97c... Typo
e647ece... Merge branch 'master' into f25
b7a4d05... fix directory ownership
33b00b1... Change buildroot macro
e6640a8... reorder spec file
0a0b96d... reorder spec file
72120cf... RHEL 6 does not have the same read-only modprobe directory
111f202... build requires libappstream-glib doesn't need a isa
9380f1e... RHEL 6 desktop-file-utils commands are more limited
cc30ec0... Remove prelink
92cfbe9... Remove nvidia-modprobe and provide udev rules that actually
878339e... Enable SLI and BaseMosaic (multimonitor on multiple cards)
ecdea98... Do not install OutputClass configuration file on anything b
787dd18... Remove remnants of no longer supported distributions
63951fd... Make sure the license is installed in both normal driver an
c363caa... Add also /dev/nvidia-uvm-tools to udev rules
41adf15... Udpate changelog
068012b... Remove OpenCL loader, RPM filters and ownership of loader c
f1a2330... Use only newer ELF TLS implementation Supported since kerne
2ba2455... Require source built libnvidia-egl-wayland library. - Libra
6840e6a... Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora
e517d7d... Update to 378.13 release
5745622... Link libGLX_indirect.so.0 to libGLX_mesa.so.0
27bac99... Link libGLX_indirect.so.0 to libGLX_mesa.so.0
d3cc2a6... Link libGLX_indirect.so.0 to libGLX_mesa.so.0
be5f85f... Link libGLX_indirect.so.0 to libGLX_mesa.so.0
c15da85... Update to 381.09 beta
3a0b780... Remove no longer existing conflicting packages
7fc8c36... Simplify folder structure.
faf0dd0... Fix RHEL 6 X and Grub configuration
bda0c02... Do not create the /usr/lib64/xorg/modules/nvidia-%{version}
44fc0bc... Update changelog
25a738f... Also use split libglvnd packages for Fedora 24 and RHEL 6/
5a11313... Hardcode installation of the alternate-install-present file
7596596... Rework
b36f031... Add triggerin to update to the new cmdline with grubby
eb60f4d... Update changelog
3e9b6fd... Fixup symlink
a8f6731... Bump nvidia egl_vendor file to 90
c608c6f... typo
2a6cb11... Update to 375.66 release
a712b8b... fix merge
3dbb127... Add epoch for triggerin
ed7eca7... Revert 10_nvidia.json rename
4f298a6... Update the triggerin to insert the new cmdline
399def3... Add dracut.conf.d/99-nvidia.conf file
5f286d9... Update .gitignore
ff645a6... Fixup for dracut in fedora
025190b... Remove GFX_PAYLOAD
024784e... Fix sed - rfbz#4553
Commits added to the branch:
f9bdc35... * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
a8b1f2a... * Tue Feb 18 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
e458eab... * Wed Apr 09 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
f20d9b7... Sync for stable (*)
342e72c... * Tue May 20 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
eeb395b... Add libvdpau on ARM (*)
267aa16... * Fri Jul 04 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
ebfc4a0... * Mon Jul 07 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
fb0c4a8... * Mon Nov 17 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
bb7c037... * Sat Dec 20 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
7e89de0... * Tue Jan 27 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
d6faf2f... fix merge (*)
7ad0d08... Merge branch 'master' into el7 (*)
0e0ddb8... Merge branch 'master' into el7 (*)
6621cee... Fix file conflict with filesystem (*)
94e9cb1... Move mesa-*gl* requires to -libs (*)
0ba17e1... Enable boolean dependency to fix 32bit installation when ne (*)
a80b617... Bump cuda-drivers release to 100 (*)
7d16c6e... Update to 375.39 release (*)
623c430... Implement cuda-libs (for steam) (*)
b5122ee... Drop GFXPAYLOAD and video=vesa:off (*)
3f37ff0... Avoid xorg dir symlink (*)
4ca4b02... Update changelog (*)
831a686... Typo (*)
5978b53... fix directory ownership (*)
4c40f35... Change buildroot macro (*)
6c3801c... reorder spec file (*)
c2195b2... reorder spec file (*)
eccfe79... RHEL 6 does not have the same read-only modprobe directory (*)
1298f86... build requires libappstream-glib doesn't need a isa (*)
2e89ed6... RHEL 6 desktop-file-utils commands are more limited (*)
5eb4709... Remove prelink (*)
b97d6e3... Remove nvidia-modprobe and provide udev rules that actually (*)
a3c8727... Enable SLI and BaseMosaic (multimonitor on multiple cards) (*)
9a8557a... Do not install OutputClass configuration file on anything b (*)
31ff8ae... Remove remnants of no longer supported distributions (*)
aaf7fb9... Make sure the license is installed in both normal driver an (*)
0e24acb... Add also /dev/nvidia-uvm-tools to udev rules (*)
e4788d0... Udpate changelog (*)
b12cb9f... Remove OpenCL loader, RPM filters and ownership of loader c (*)
eb953bc... Use only newer ELF TLS implementation Supported since kerne (*)
b0949b8... Require source built libnvidia-egl-wayland library. - Libra (*)
633251b... Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora (*)
abece21... Update to 378.13 release (*)
17ccea7... Link libGLX_indirect.so.0 to libGLX_mesa.so.0 (*)
7f1ef66... Link libGLX_indirect.so.0 to libGLX_mesa.so.0 (*)
a3c7d83... Update to 381.09 beta (*)
06a9aba... Remove no longer existing conflicting packages (*)
1d08823... Simplify folder structure. (*)
acecaa1... Fix RHEL 6 X and Grub configuration (*)
5b9e8ff... Do not create the /usr/lib64/xorg/modules/nvidia-%{version} (*)
7a3a855... Update changelog (*)
cf8ee39... Also use split libglvnd packages for Fedora 24 and RHEL 6/ (*)
417d70b... Hardcode installation of the alternate-install-present file (*)
b7bd4f9... Rework (*)
7bc225f... Add triggerin to update to the new cmdline with grubby (*)
819fecd... Update changelog (*)
630df23... Fixup symlink (*)
a7a8221... Bump nvidia egl_vendor file to 90 (*)
b9d1d65... typo (*)
f6ac366... Update to 375.66 release (*)
2244806... Add epoch for triggerin (*)
eaf1973... Revert 10_nvidia.json rename (*)
6d4f02b... Update the triggerin to insert the new cmdline (*)
2d1ee4c... Add dracut.conf.d/99-nvidia.conf file (*)
bf5c264... Update .gitignore (*)
b8dabbc... Fixup for dracut in fedora (*)
75c0f1b... Remove GFX_PAYLOAD (*)
ef733aa... Fix sed - rfbz#4553 (*)
8886dbe... Use boolean dependency on fedora 25 also (*)
dfdc17f... Make libglvnd optional on rhel (*)
bbfffec... Update changelog (*)
ce41362... Fixup for rhel (*)
1eadd92... back to non-glvnd version for vulkan when needed (*)
a54d1ac... Fixup for non-glvnd vulkan loader (*)
01849bb... Fixup _target_cpu macro (*)
f1742f1... fix up glvnd support for epel7 (*)
3785159... fix up vulkan as there is no libGL.so.1 currently installad (*)
0ee3df7... Fix non-glvnd build (*)
128652b... Update to 375.82 release (*)
1481117... trim changelog (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months
[xorg-x11-drv-nvidia] (81 commits) Non-fast-forward update to branch f26
by Nicolas Chauvet
The branch 'f26' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:
http://live.gnome.org/Git/Help/NonFastForward
Commits removed from the branch:
8295212... Fix file conflict with filesystem
f63d823... Move mesa-*gl* requires to -libs
e0c9a56... Enable boolean dependency to fix 32bit installation when ne
3e44442... Bump cuda-drivers release to 100
286375c... Update to 375.39 release
77b2faa... Implement cuda-libs (for steam)
fd9df17... Drop GFXPAYLOAD and video=vesa:off
67b680c... Avoid xorg dir symlink
c405bd2... Update changelog
2fea97c... Typo
b7a4d05... fix directory ownership
33b00b1... Change buildroot macro
e6640a8... reorder spec file
0a0b96d... reorder spec file
72120cf... RHEL 6 does not have the same read-only modprobe directory
111f202... build requires libappstream-glib doesn't need a isa
9380f1e... RHEL 6 desktop-file-utils commands are more limited
cc30ec0... Remove prelink
92cfbe9... Remove nvidia-modprobe and provide udev rules that actually
878339e... Enable SLI and BaseMosaic (multimonitor on multiple cards)
ecdea98... Do not install OutputClass configuration file on anything b
787dd18... Remove remnants of no longer supported distributions
63951fd... Make sure the license is installed in both normal driver an
c363caa... Add also /dev/nvidia-uvm-tools to udev rules
41adf15... Udpate changelog
068012b... Remove OpenCL loader, RPM filters and ownership of loader c
f1a2330... Use only newer ELF TLS implementation Supported since kerne
2ba2455... Require source built libnvidia-egl-wayland library. - Libra
6840e6a... Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora
e517d7d... Update to 378.13 release
5745622... Link libGLX_indirect.so.0 to libGLX_mesa.so.0
d3cc2a6... Link libGLX_indirect.so.0 to libGLX_mesa.so.0
c15da85... Update to 381.09 beta
3a0b780... Remove no longer existing conflicting packages
7fc8c36... Simplify folder structure.
faf0dd0... Fix RHEL 6 X and Grub configuration
bda0c02... Do not create the /usr/lib64/xorg/modules/nvidia-%{version}
44fc0bc... Update changelog
25a738f... Also use split libglvnd packages for Fedora 24 and RHEL 6/
5a11313... Hardcode installation of the alternate-install-present file
7596596... Rework
b36f031... Add triggerin to update to the new cmdline with grubby
eb60f4d... Update changelog
3e9b6fd... Fixup symlink
a8f6731... Bump nvidia egl_vendor file to 90
c608c6f... typo
2a6cb11... Update to 375.66 release
53c03e0... Add epoch for triggerin
2c4de6c... Revert 10_nvidia.json rename
22bc700... Update the triggerin to insert the new cmdline
a7d0bc2... Add dracut.conf.d/99-nvidia.conf file
ac7a01a... Update .gitignore
eb72cde... Fixup for dracut in fedora
403216a... Remove GFX_PAYLOAD
cae1d0a... Fix sed - rfbz#4553
Commits added to the branch:
f9bdc35... * Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
a8b1f2a... * Tue Feb 18 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
e458eab... * Wed Apr 09 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
f20d9b7... Sync for stable (*)
342e72c... * Tue May 20 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
eeb395b... Add libvdpau on ARM (*)
267aa16... * Fri Jul 04 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
ebfc4a0... * Mon Jul 07 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
fb0c4a8... * Mon Nov 17 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
bb7c037... * Sat Dec 20 2014 Leigh Scott <leigh123linux(a)googlemail.com (*)
7e89de0... * Tue Jan 27 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
d6faf2f... fix merge (*)
7ad0d08... Merge branch 'master' into el7 (*)
0e0ddb8... Merge branch 'master' into el7 (*)
6621cee... Fix file conflict with filesystem (*)
94e9cb1... Move mesa-*gl* requires to -libs (*)
0ba17e1... Enable boolean dependency to fix 32bit installation when ne (*)
a80b617... Bump cuda-drivers release to 100 (*)
7d16c6e... Update to 375.39 release (*)
623c430... Implement cuda-libs (for steam) (*)
b5122ee... Drop GFXPAYLOAD and video=vesa:off (*)
3f37ff0... Avoid xorg dir symlink (*)
4ca4b02... Update changelog (*)
831a686... Typo (*)
5978b53... fix directory ownership (*)
4c40f35... Change buildroot macro (*)
6c3801c... reorder spec file (*)
c2195b2... reorder spec file (*)
eccfe79... RHEL 6 does not have the same read-only modprobe directory (*)
1298f86... build requires libappstream-glib doesn't need a isa (*)
2e89ed6... RHEL 6 desktop-file-utils commands are more limited (*)
5eb4709... Remove prelink (*)
b97d6e3... Remove nvidia-modprobe and provide udev rules that actually (*)
a3c8727... Enable SLI and BaseMosaic (multimonitor on multiple cards) (*)
9a8557a... Do not install OutputClass configuration file on anything b (*)
31ff8ae... Remove remnants of no longer supported distributions (*)
aaf7fb9... Make sure the license is installed in both normal driver an (*)
0e24acb... Add also /dev/nvidia-uvm-tools to udev rules (*)
e4788d0... Udpate changelog (*)
b12cb9f... Remove OpenCL loader, RPM filters and ownership of loader c (*)
eb953bc... Use only newer ELF TLS implementation Supported since kerne (*)
b0949b8... Require source built libnvidia-egl-wayland library. - Libra (*)
633251b... Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora (*)
abece21... Update to 378.13 release (*)
17ccea7... Link libGLX_indirect.so.0 to libGLX_mesa.so.0 (*)
7f1ef66... Link libGLX_indirect.so.0 to libGLX_mesa.so.0 (*)
a3c7d83... Update to 381.09 beta (*)
06a9aba... Remove no longer existing conflicting packages (*)
1d08823... Simplify folder structure. (*)
acecaa1... Fix RHEL 6 X and Grub configuration (*)
5b9e8ff... Do not create the /usr/lib64/xorg/modules/nvidia-%{version} (*)
7a3a855... Update changelog (*)
cf8ee39... Also use split libglvnd packages for Fedora 24 and RHEL 6/ (*)
417d70b... Hardcode installation of the alternate-install-present file (*)
b7bd4f9... Rework (*)
7bc225f... Add triggerin to update to the new cmdline with grubby (*)
819fecd... Update changelog (*)
630df23... Fixup symlink (*)
a7a8221... Bump nvidia egl_vendor file to 90 (*)
b9d1d65... typo (*)
f6ac366... Update to 375.66 release (*)
2244806... Add epoch for triggerin (*)
eaf1973... Revert 10_nvidia.json rename (*)
6d4f02b... Update the triggerin to insert the new cmdline (*)
2d1ee4c... Add dracut.conf.d/99-nvidia.conf file (*)
bf5c264... Update .gitignore (*)
b8dabbc... Fixup for dracut in fedora (*)
75c0f1b... Remove GFX_PAYLOAD (*)
ef733aa... Fix sed - rfbz#4553 (*)
8886dbe... Use boolean dependency on fedora 25 also (*)
dfdc17f... Make libglvnd optional on rhel (*)
bbfffec... Update changelog (*)
ce41362... Fixup for rhel (*)
1eadd92... back to non-glvnd version for vulkan when needed (*)
a54d1ac... Fixup for non-glvnd vulkan loader (*)
01849bb... Fixup _target_cpu macro (*)
f1742f1... fix up glvnd support for epel7 (*)
3785159... fix up vulkan as there is no libGL.so.1 currently installad (*)
0ee3df7... Fix non-glvnd build (*)
128652b... Update to 375.82 release (*)
1481117... trim changelog (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 9 months