/[smeserver]/rpms/smeserver-mysql/sme10/smeserver-mysql.spec
ViewVC logotype

Diff of /rpms/smeserver-mysql/sme10/smeserver-mysql.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jpp, Sun Mar 13 02:38:23 2022 UTC Revision 1.27 by jpp, Sun Apr 10 21:50:57 2022 UTC
# Line 2  Summary: Koozali SME Server specific mys Line 2  Summary: Koozali SME Server specific mys
2  %define name smeserver-mysql  %define name smeserver-mysql
3  Name: %{name}  Name: %{name}
4  %define version 2.7.0  %define version 2.7.0
5  %define release 1  %define release 14
6  Version: %{version}  Version: %{version}
7  Release: %{release}%{?dist}  Release: %{release}%{?dist}
8  License: GPL  License: GPL
9  Group: Networking/Daemons  Group: Networking/Daemons
10  Source: %{name}-%{version}.tar.xz  Source: %{name}-%{version}.tar.xz
11    Patch0: smeserver-mysql-2.7.0-bz11899-sclo.patch
12    Patch1: smeserver-mysql-2.7.0-bz11922-mysqlinit.patch
13    Patch2: smeserver-mysql-2.7.0-bz11936.patch
14    
15  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
16  BuildArchitectures: noarch  BuildArchitectures: noarch
17  Requires: mariadb-server  Requires: mariadb-server
18    # mariadb after 5.5 /in Centos 8 will package mysql_upgrade in mariadb-server-utils
19    # Requires: /usr/bin/mysql_upgrade
20  Requires: mariadb  Requires: mariadb
21  Requires: e-smith-base  Requires: e-smith-base
22  Requires: e-smith-lib >= 1.15.1-19  Requires: e-smith-lib >= 1.15.1-19
# Line 27  mysql. Line 32  mysql.
32    
33  %prep  %prep
34  %setup  %setup
35    %patch0 -p1
36    %patch1 -p1
37    %patch2 -p1
38    
39  %build  %build
40  for ver in  101 102 103 105  for ver in  101 102 103 105
# Line 48  do Line 56  do
56  # default values from /etc/opt/rh/rh-mariadb101/my.cnf.d/mariadb-server.cnf  # default values from /etc/opt/rh/rh-mariadb101/my.cnf.d/mariadb-server.cnf
57  basedir="/opt/rh/rh-mariadb$ver/root/usr"  basedir="/opt/rh/rh-mariadb$ver/root/usr"
58  datadir="/var/opt/rh/rh-mariadb$ver/lib/mysql"  datadir="/var/opt/rh/rh-mariadb$ver/lib/mysql"
59  socket="/var/lib/mysql/maradb$ver.sock"  socket="/var/lib/mysql/mariadb$ver.sock"
60  logerror="/var//log/mariadb$ver/mariadb.log"  logerror="/var//log/mariadb$ver/mariadb.log"
61  #"/var/opt/rh/rh-mariadb$ver/log/mariadb/mariadb.log"  #"/var/opt/rh/rh-mariadb$ver/log/mariadb/mariadb.log"
62  pidfile="/var/run/rh-mariadb$ver-mariadb/mariadb.pid"  pidfile="/var/run/rh-mariadb$ver-mariadb/mariadb.pid"
# Line 110  sed -i root$ver/etc/e-smith/events/actio Line 118  sed -i root$ver/etc/e-smith/events/actio
118          -i root$ver/etc/e-smith/events/actions/mariadb${ver}-delete-dumped-tables \          -i root$ver/etc/e-smith/events/actions/mariadb${ver}-delete-dumped-tables \
119          -i root$ver/etc/e-smith/events/actions/mariadb${ver}-dump-tables \          -i root$ver/etc/e-smith/events/actions/mariadb${ver}-dump-tables \
120          -i root$ver/etc/e-smith/events/actions/mariadb${ver}-load-tables \          -i root$ver/etc/e-smith/events/actions/mariadb${ver}-load-tables \
121          -e "s_!!!VER!!!_${ver}_g"          -e "s_!!!VER!!!_${ver}_g" \
122            -e "s_!!!SOCKET!!!_${socket}_g"
123    
124  ##metadata  ##metadata
125  mkdir -p root$ver/etc/e-smith/templates.metadata/etc/e-smith/  mkdir -p root$ver/etc/e-smith/templates.metadata/etc/e-smith/sql
126  cp -a root/etc/e-smith/templates.metadata/etc/e-smith/sql root$ver/etc/e-smith/templates.metadata/etc/e-smith/sql$ver  cp -a root/etc/e-smith/templates.metadata/etc/e-smith/sql/init root$ver/etc/e-smith/templates.metadata/etc/e-smith/sql/init$ver
127    
128    
129  ##templates  ##templates
# Line 123  cp   root/etc/e-smith/templates/etc/e-sm Line 132  cp   root/etc/e-smith/templates/etc/e-sm
132  sed -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/00_restore_dumped_dbs  -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/10mysql_upgrade \  sed -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/00_restore_dumped_dbs  -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/10mysql_upgrade \
133          -e "s_e-smith/db/mysql_e-smith/db/mariadb${ver}_g" \          -e "s_e-smith/db/mysql_e-smith/db/mariadb${ver}_g" \
134          -e "s_/usr/bin/mysql_/opt/rh/rh-mariadb${ver}/root/usr/bin/mysql_g" \          -e "s_/usr/bin/mysql_/opt/rh/rh-mariadb${ver}/root/usr/bin/mysql_g" \
135          -e "s_mariadb.service_rh-mariadb$ver-mariadb.service_" \          -e "s_mariadb.service_mariadb$ver-mariadb.service_" \
136          -e "s_/var/run/mariadb/mariadb.pid_${pidfile}_g" \          -e "s_/var/run/mariadb/mariadb.pid_${pidfile}_g" \
137          -e "s_mysqld_rh-mariadb$ver-mariadb_g" \          -e "s_mysqld_mariadb$ver-mariadb_g" \
138          -e "s_| mysql |_| /opt/rh/rh-mariadb${ver}/root/usr/bin/mysql --socket=$socket |_g" \          -e "s_| mysql |_| /opt/rh/rh-mariadb${ver}/root/usr/bin/mysql --socket=$socket |_g" \
139          -e "s_mysql\_upgrade_mysql\_upgrade --socket=$socket _g"          -e "s_mysql\_upgrade_mysql\_upgrade --socket=$socket _g"
140  mkdir -p root$ver/etc/e-smith/templates/etc/my.cnf  mkdir -p root$ver/etc/e-smith/templates/etc/my.cnf
# Line 158  cp rootscl/sbin/e-smith/mariadb_VER_-pre Line 167  cp rootscl/sbin/e-smith/mariadb_VER_-pre
167  sed -i root$ver/sbin/e-smith/systemd/mariadb${ver}-initialize -i root$ver/sbin/e-smith/systemd/mariadb${ver}-mysql.init \  sed -i root$ver/sbin/e-smith/systemd/mariadb${ver}-initialize -i root$ver/sbin/e-smith/systemd/mariadb${ver}-mysql.init \
168          -i root$ver/sbin/e-smith/mariadb${ver}-preload \          -i root$ver/sbin/e-smith/mariadb${ver}-preload \
169          -e "s_!!!VER!!!_${ver}_g" \          -e "s_!!!VER!!!_${ver}_g" \
170          -e "s_!!!SOCKET!!!_$socket _g"          -e "s_!!!SOCKET!!!_${socket}_g"
171    if [ $ver -ge  104 ]
172    then
173      cp rootscl/sbin/e-smith/systemd/mariadb_VER_-post root$ver/sbin/e-smith/systemd/mariadb${ver}-post
174      sed -i root$ver/sbin/e-smith/systemd/mariadb${ver}-post -e "s_!!!VER!!!_${ver}_g" -e "s_!!!SOCKET!!!_${socket}_g"
175    fi
176    
177    
178  ## logrotate  ## logrotate
179  mkdir -p root$ver/etc/logrotate.d/  mkdir -p root$ver/etc/logrotate.d/
180  sed rootscl/etc/logrotate.d/mariadb_VER_ -e "s_!!!VER!!!_${ver}_g" > root$ver/etc/logrotate.d/mariadb${ver}  sed rootscl/etc/logrotate.d/mariadb_VER_ -e "s_!!!VER!!!_${ver}_g" \
181  #cp -a root/etc/e-smith/templates/etc/logrotate.d/mariadb root$ver/etc/e-smith/templates/etc/logrotate.d/mariadb$ver          -e "s_!!!SOCKET!!!_${socket}_g" > root$ver/etc/logrotate.d/mariadb${ver}
 # TODO sed -i add  --socket= and change path  
182    
183    
184  #systemd service  #systemd service
# Line 175  cp rootscl/usr/lib/systemd/system/mariad Line 189  cp rootscl/usr/lib/systemd/system/mariad
189  cp rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service root$ver/usr/lib/systemd/system/mariadb${ver}-mysql.init.service  cp rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service root$ver/usr/lib/systemd/system/mariadb${ver}-mysql.init.service
190  sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service -i root$ver/usr/lib/systemd/system/mariadb${ver}-mysql.init.service \  sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service -i root$ver/usr/lib/systemd/system/mariadb${ver}-mysql.init.service \
191          -e "s_!!!VER!!!_${ver}_g"          -e "s_!!!VER!!!_${ver}_g"
192    if [ $ver -ge  102 ]
193    then
194      sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \
195            -e "s/_safe//" \
196            -e "s/^ExecStopPost.*//";
197    fi
198    if [ $ver -ge  104 ]
199    then
200      sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \
201            -e 's_set.password$_set.password2_'
202      sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \
203             -e "/^#ExecStartPost=/ i ExecStartPost=\/sbin\/e-smith\/systemd\/mariadb${ver}-post"
204    
205    fi
206    
207  #### TODO check it is similar to rh one and functional !  #### TODO check it is similar to rh one and functional !
208    
209  #/usb/bin to ease user  #/usr/bin to ease user
210  mkdir root$ver/usr/bin  mkdir root$ver/usr/bin
211  for i in  mysql mysqlshow mysqladmin mysqldump mysqlimport mysqlbinlog  for i in  mysql mysqlshow mysqladmin mysqldump mysqlimport mysqlbinlog
212  do  do
213    echo "/opt/rh/rh-mariadb${ver}/root/usr/bin/$i --socket=/var/lib/mysql/maradb${ver}.sock \"\$\@\" $i" >root$ver/usr/bin/$i${ver}    echo "/opt/rh/rh-mariadb${ver}/root/usr/bin/$i --socket=/var/lib/mysql/mariadb${ver}.sock \"\$@\"" >root$ver/usr/bin/$i${ver}
214  done  done
215    
216    #phpMyAdmin template
217    mkdir -p root$ver/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/
218    sed rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_  \
219            -e "s_!!!SOCKET!!!_${socket}_g" \
220            -e "s_!!!VER!!!_${ver}_g" > root$ver/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql${ver}
221    
222  done  done
223    
224  ###################################################  ###################################################
# Line 208  do Line 244  do
244  /sbin/e-smith/genfilelist root$ver/ \  /sbin/e-smith/genfilelist root$ver/ \
245      --file "/sbin/e-smith/systemd/mariadb$ver-initialize" 'attr(0554,root,root)' \      --file "/sbin/e-smith/systemd/mariadb$ver-initialize" 'attr(0554,root,root)' \
246      --file "/sbin/e-smith/systemd/mariadb$ver-mysql.init" 'attr(0554,root,root)' \      --file "/sbin/e-smith/systemd/mariadb$ver-mysql.init" 'attr(0554,root,root)' \
247        --file "/sbin/e-smith/systemd/mariadb$ver-post" 'attr(0554,root,root)' \
248      --dir "/home/e-smith/db/mariadb$ver" 'attr(0750,root,root)' \      --dir "/home/e-smith/db/mariadb$ver" 'attr(0750,root,root)' \
249      --dir "/var/log/mariadb$ver" 'attr(0750,mysql,mysql)' \      --dir "/var/log/mariadb$ver" 'attr(0750,mysql,mysql)' \
250        --file "/usr/bin/mysql$ver" 'attr(0554,root,root)' \
251        --file "/usr/bin/mysqladmin$ver" 'attr(0554,root,root)' \
252        --file "/usr/bin/mysqlbinlog$ver" 'attr(0554,root,root)' \
253        --file "/usr/bin/mysqldump$ver" 'attr(0554,root,root)' \
254        --file "/usr/bin/mysqlimport$ver" 'attr(0554,root,root)' \
255        --file "/usr/bin/mysqlshow$ver" 'attr(0554,root,root)' \
256  | grep -vE '/home/e-smith/db/mysql$' \  | grep -vE '/home/e-smith/db/mysql$' \
257      > %{name}-%{version}-filelist-mariadb$ver      > %{name}-%{version}-filelist-mariadb$ver
258  echo "%doc COPYING"          >> %{name}-%{version}-filelist-mariadb$ver  echo "%doc COPYING"          >> %{name}-%{version}-filelist-mariadb$ver
# Line 271  Group:          Database Line 314  Group:          Database
314  Requires:       rh-mariadb103  Requires:       rh-mariadb103
315  Requires:       rh-mariadb103-mariadb  Requires:       rh-mariadb103-mariadb
316  Requires:       rh-mariadb103-mariadb-server  Requires:       rh-mariadb103-mariadb-server
317    Requires:       rh-mariadb103-mariadb-server-utils
318  BuildRequires:  e-smith-devtools >= 1.13.1-03  BuildRequires:  e-smith-devtools >= 1.13.1-03
319    
320  %description    -n smeserver-mariadb103  %description    -n smeserver-mariadb103
# Line 286  Group:          Database Line 330  Group:          Database
330  Requires:       rh-mariadb105  Requires:       rh-mariadb105
331  Requires:       rh-mariadb105-mariadb  Requires:       rh-mariadb105-mariadb
332  Requires:       rh-mariadb105-mariadb-server  Requires:       rh-mariadb105-mariadb-server
333    Requires:       rh-mariadb105-mariadb-server-utils
334  BuildRequires:  e-smith-devtools >= 1.13.1-03  BuildRequires:  e-smith-devtools >= 1.13.1-03
335    Requires:       smeserver-mysql >= 2.7.0-5
336  %description    -n smeserver-mariadb105  %description    -n smeserver-mariadb105
337  Koozali SME Server configuration package for mariadb105 RH SCLo  Koozali SME Server configuration package for mariadb105 RH SCLo
338    
# Line 299  Koozali SME Server configuration package Line 344  Koozali SME Server configuration package
344    
345    
346  %changelog  %changelog
347    * Sun Apr 10 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-14.sme
348    - /usr/libexec/mysql-wait-stop not used after mariadb101 [SME: 11936]
349    
350    * Sat Apr 09 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-13.sme
351    - fix few typos [SME: 11936]
352    
353    * Sat Apr 02 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-12.sme
354    - remove SourcePath from mysql-init service file [SME: 11922]
355    
356    * Wed Mar 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-11.sme
357    - fix mariadb*-mysql.init path in service file [SME: 11899]
358    
359    * Wed Mar 16 2022 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-10.sme
360    - fix sclo metadata path for sql/init templated scripts [SME: 11899]
361    
362    * Wed Mar 16 2022 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
363    - missing sockets for backup of db [SME: 11899]
364    
365    * Mon Mar 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-7.sme
366    - adding requirement for mariadb-server-utils (105 and 103) [SME: 11899]
367    
368    * Mon Mar 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-6.sme
369    - fix password for mariadb 105 [SME: 11899]
370    
371    * Sun Mar 13 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-5.sme
372    - fix typo in socket, seen with phpmyadmin [SME: 11899]
373    - fix permissions for mariadb105 [SME: 11899]
374      create a dedicated set.password for mariadb>103
375    
376    * Sun Mar 13 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-3.sme
377    - missing phpMyAdmin fragments [SME: 11899]
378    
379    * Sun Mar 13 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-2.sme
380    - fix few sclo issues [SME: 11899]
381      missing +x for binaries shortcut
382      mariadb105 passwordless root access
383      mysqld_safe-scl-helper vs mysqld-scl-helper
384    
385  * Fri Mar 11 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-1.sme  * Fri Mar 11 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-1.sme
386  - prepare spec for multiple version support [SME: 11899]  - prepare spec for multiple version support [SME: 11899]
387  - package renamed from e-smith-mysql to smeserver-mysql [SME: 11897]  - package renamed from e-smith-mysql to smeserver-mysql [SME: 11897]
388  - remove duplicate logrotate and remove unsused template [SME: 11467]  - remove duplicate logrotate and remove unsused template [SME: 11467]
389  - move scripts /etc/rc.d/init.d/mysql-init to /sbin/e-smith/systemd [SME: 11898]  - move scripts /etc/rc.d/init.d/mysql-init to /sbin/e-smith/systemd [SME: 11898]
390  - add rh-mariadb101 support [SME: ]  - add rh-mariadb101 support [SME: 11901]
391  - add rh-mariadb102 support [SME: ]  - add rh-mariadb102 support [SME: 11902]
392  - add rh-mariadb103 support [SME: ]  - add rh-mariadb103 support [SME: 11903]
393  - add rh-mariadb105 support [SME: ]  - add rh-mariadb105 support [SME: 11904]
394    
395  * Tue Aug 17 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-22.sme  * Tue Aug 17 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-22.sme
396  - Remove template and set default max_allowed_packet=16M  - Remove template and set default max_allowed_packet=16M

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed