From 5a8989b1685c005757a23dcc3640d2fe11c6ff4c Mon Sep 17 00:00:00 2001 From: Andy Bauer Date: Tue, 2 Feb 2016 11:47:55 -0600 Subject: [PATCH] Minor RPM packaging changes --- distros/fedora/README.Fedora | 14 +++++--------- distros/fedora/zoneminder.f22.spec | 2 +- distros/fedora/zoneminder.f23.spec | 2 +- distros/redhat/README.CentOS | 11 +++-------- distros/redhat/README.Centos7 | 14 +++++--------- distros/redhat/zoneminder.el6.spec | 2 +- distros/redhat/zoneminder.el7.spec | 2 +- 7 files changed, 17 insertions(+), 30 deletions(-) diff --git a/distros/fedora/README.Fedora b/distros/fedora/README.Fedora index 85088d868..0f88a9a16 100644 --- a/distros/fedora/README.Fedora +++ b/distros/fedora/README.Fedora @@ -44,12 +44,10 @@ New installs set during the previous step, you will need to create the ZoneMinder database and configure a database account for ZoneMinder to use: - mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql - mysql -u root -p - mysql> grant all - on zm.* to 'zmuser'@localhost identified by 'zmpass'; - mysql> exit; - mysqladmin -u root -p reload + mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql + mysql -uroot -p -e "grant all on zm.* to \ + 'zmuser'@localhost identified by 'zmpass';" + mysqladmin -uroot -p reload The database account credentials, zmuser/zmpass, are arbitrary. Set them to anything that suits your envinroment. @@ -125,9 +123,7 @@ Upgrades have increased. Verify the zmuser database account has been granted all permission to the ZoneMinder database: - mysql -u root -p - mysql> show grants for zmuser@localhost; - mysql> exit; + mysql -uroot -p -e "show grants for zmuser@localhost;" See step 2 of the Installation section to add missing permissions. diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec index 2169bb256..9beef6319 100644 --- a/distros/fedora/zoneminder.f22.spec +++ b/distros/fedora/zoneminder.f22.spec @@ -138,7 +138,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc +%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf %config(noreplace) /etc/tmpfiles.d/zoneminder.conf diff --git a/distros/fedora/zoneminder.f23.spec b/distros/fedora/zoneminder.f23.spec index 8115a3f58..14b653117 100644 --- a/distros/fedora/zoneminder.f23.spec +++ b/distros/fedora/zoneminder.f23.spec @@ -138,7 +138,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc +%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf %config(noreplace) /etc/tmpfiles.d/zoneminder.conf diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS index e6e53bbc6..f0e627c90 100644 --- a/distros/redhat/README.CentOS +++ b/distros/redhat/README.CentOS @@ -30,12 +30,9 @@ New installs will need to create the ZoneMinder database and configure a database account for ZoneMinder to use: - mysql -uroot -p - mysql> create database zm; - mysql> grant all - on zm.* to 'zmuser'@localhost identified by 'zmpass'; - mysql> exit; mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql + mysql -uroot -p -e "grant all on zm.* to \ + 'zmuser'@localhost identified by 'zmpass';" mysqladmin -uroot -p reload The database account credentials, zmuser/zmpass, are arbitrary. Set them to @@ -117,9 +114,7 @@ New installs have increased. Verify the zmuser database account has been granted all permission to the ZoneMinder database: - mysql -u root -p - mysql> show grants for zmuser@localhost; - mysql> exit; + mysql -uroot -p -e "show grants for zmuser@localhost;" See step 2 of the Installation section to add missing permissions. diff --git a/distros/redhat/README.Centos7 b/distros/redhat/README.Centos7 index 451f4290b..f4566b01c 100644 --- a/distros/redhat/README.Centos7 +++ b/distros/redhat/README.Centos7 @@ -32,12 +32,10 @@ New installs will need to create the ZoneMinder database and configure a database account for ZoneMinder to use: - mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql - mysql -u root -p - mysql> grant all - on zm.* to 'zmuser'@localhost identified by 'zmpass'; - mysql> exit; - mysqladmin -u root -p reload + mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql + mysql -uroot -p -e "grant all on zm.* to \ + 'zmuser'@localhost identified by 'zmpass';" + mysqladmin -uroot -p reload The database account credentials, zmuser/zmpass, are arbitrary. Set them to anything that suits your envinroment. @@ -112,9 +110,7 @@ Upgrades have increased. Verify the zmuser database account has been granted all permission to the ZoneMinder database: - mysql -u root -p - mysql> show grants for zmuser@localhost; - mysql> exit; + mysql -uroot -p -e "show grants for zmuser@localhost;" See step 2 of the Installation section to add missing permissions. diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec index 97623addf..82406d431 100644 --- a/distros/redhat/zoneminder.el6.spec +++ b/distros/redhat/zoneminder.el6.spec @@ -130,7 +130,7 @@ rm -rf %{_docdir}/%{name}-%{version} %files %defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS distros/redhat/jscalendar-doc +%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS distros/redhat/README.https distros/redhat/jscalendar-doc %doc distros/redhat/local_zoneminder.te %config %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec index 60406b477..c350553b3 100644 --- a/distros/redhat/zoneminder.el7.spec +++ b/distros/redhat/zoneminder.el7.spec @@ -137,7 +137,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/jscalendar-doc +%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/README.https distros/redhat/jscalendar-doc %doc distros/redhat/local_zoneminder.te %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf