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

Diff of /rpms/e-smith-mysql/sme10/e-smith-mysql.spec

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

Revision 1.18 by jpp, Tue Dec 8 19:57:09 2020 UTC Revision 1.26 by jcrisp, Tue Aug 17 15:15:50 2021 UTC
# Line 1  Line 1 
1  # $Id: e-smith-mysql.spec,v 1.17 2020/12/08 03:49:44 jpp Exp $  # $Id: e-smith-mysql.spec,v 1.25 2021/03/19 02:48:48 jpp Exp $
2    
3  Summary: e-smith specific mysql configuration and templates.  Summary: e-smith specific mysql configuration and templates.
4  %define name e-smith-mysql  %define name e-smith-mysql
5  Name: %{name}  Name: %{name}
6  %define version 2.6.0  %define version 2.6.0
7  %define release 15  %define release 22
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 19  Patch5: e-smith-mysql-2.6.0.bz9688.skipr Line 19  Patch5: e-smith-mysql-2.6.0.bz9688.skipr
19  Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch  Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch
20  Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch  Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
21  Patch8: e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch  Patch8: e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch
22    Patch9: e-smith-mysql-2.6.0-bz7827-dumpfailure.patch
23    Patch10: e-smith-mysql-2.6.0-bz455-bz4606-bz11404-bz11425.patch
24    Patch11: e-smith-mysql-2.6.0.bz11453-sme9restoreerror.patch
25    Patch12: e-smith-mysql-2.6.0-bz11468.patch
26    Patch13: e-smith-mysql-2.6.0.bz11672-max_allowed_packet.patch
27    
28  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
29  BuildArchitectures: noarch  BuildArchitectures: noarch
# Line 30  BuildRequires: e-smith-devtools >= 1.13. Line 35  BuildRequires: e-smith-devtools >= 1.13.
35  AutoReqProv: no  AutoReqProv: no
36    
37  %changelog  %changelog
38    * Tue Aug 17 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-22.sme
39    - Remove template and set default max_allowed_packet=16M
40    
41    * Thu Mar 18 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-21.sme
42    - fix wrong path for set password [SME: 11468]
43    
44    * Sat Mar 14 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-20.sme
45    - fix restore of sme9 backup fails to start mysql.init [SME: 11453]
46    
47    * Thu Mar 04 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-19.sme
48    - add property to enable  mysqld slow queries log [SME: 455]
49      simply use SlowQueries as the amount of second and it is enabled
50      remove property to stop logging
51    - more mysqld/mariadb parameter available with properties /templates  [SME: 4606]
52    - ease 4 databit characters with innodb [SME: 11404]
53    - redirect mariadb log from systemd to file [SME: 11425]
54    
55    * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-18.sme
56    - fix backup fails in pre-backup in mysqldump [SME: 7827]
57    
58    * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
59    - expand 10mysql_upgrade and restart mysql.init on e-smith-mysql-update [SME: 11120]
60      this to make sure mariadb upgrade fully and prevent residual 10mysql_upgrade stay in the way
61    
62    * Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
63    - fix issue with 10mysql_upgrade crashing mariadb [SME: 11120]
64      also removed noise from spec file
65    
66  * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme  * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
67  - e-smith-update event [SME: 11145]  - e-smith-update event [SME: 11145]
68  - mariadb systemd integration [SME: 11021]  - mariadb systemd integration [SME: 11021]
# Line 785  rm -rf root/var/run/ Line 818  rm -rf root/var/run/
818  rm -rf root/var/log/mysqld  rm -rf root/var/log/mysqld
819  rm -f root/etc/rc.d/init.d/supervise/mysqld  rm -f root/etc/rc.d/init.d/supervise/mysqld
820  rm -f root/etc/rc.d/rc7.d/S50mysqld  rm -f root/etc/rc.d/rc7.d/S50mysqld
   
821  mkdir -p root/var/log/mariadb.run  mkdir -p root/var/log/mariadb.run
822  %patch6 -p1  %patch6 -p1
823  # move mariadb to systemd  # move mariadb to systemd
# Line 796  rm -rf root/var/service Line 828  rm -rf root/var/service
828  rm -rf root/service  rm -rf root/service
829  rm -rf root/etc/rc.d/init.d/supervise  rm -rf root/etc/rc.d/init.d/supervise
830  rm -rf root/var/log  rm -rf root/var/log
   
831  # move mysql.init  # move mysql.init
832  %patch8 -p1  %patch8 -p1
833  rm -rf root/etc/rc.d/rc7.d  rm -rf root/etc/rc.d/rc7.d
834    %patch9 -p1
835    %patch10 -p1
836    %patch11 -p1
837    %patch12 -p1
838    %patch13 -p1
839    
840  %build  %build
841  perl createlinks  perl createlinks
# Line 809  rm -rf $RPM_BUILD_ROOT Line 845  rm -rf $RPM_BUILD_ROOT
845  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
846  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
847      --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \      --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \
     --file /var/service/mariadb/run 'attr(0755,root,root)' \  
     --file /var/service/mariadb/control/t 'attr(0750,root,root)' \  
     --file /var/service/mariadb/control/d 'attr(0750,root,root)' \  
     --file /var/service/mariadb/control/i 'attr(0750,root,root)' \  
     --file /var/service/mariadb/control/q 'attr(0750,root,root)' \  
     --file /var/service/mariadb/log/run 'attr(0755,root,root)' \  
848      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
849      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
850      > %{name}-%{version}-filelist      > %{name}-%{version}-filelist
# Line 828  if [ $1 -gt 1 ] ; then Line 858  if [ $1 -gt 1 ] ; then
858    if [ -e /var/service/mariadb/run ] ; then    if [ -e /var/service/mariadb/run ] ; then
859          /usr/bin/sv d mariadb          /usr/bin/sv d mariadb
860          /usr/bin/sv d mariadb/log          /usr/bin/sv d mariadb/log
         # also  
         rm -rf /var/service/mariadb  
861    fi    fi
862  fi  fi
863    

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