/[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.17 by jpp, Tue Dec 8 03:49:44 2020 UTC Revision 1.22 by jpp, Wed Jan 27 19:46:06 2021 UTC
# Line 1  Line 1 
1  # $Id: e-smith-mysql.spec,v 1.16 2020/12/08 03:26:23 jpp Exp $  # $Id: e-smith-mysql.spec,v 1.21 2020/12/13 22:09:39 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 14  %define release 18
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    
24  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
25  BuildArchitectures: noarch  BuildArchitectures: noarch
# Line 30  BuildRequires: e-smith-devtools >= 1.13. Line 31  BuildRequires: e-smith-devtools >= 1.13.
31  AutoReqProv: no  AutoReqProv: no
32    
33  %changelog  %changelog
34  * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme  * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-18.sme
35    - fix backup fails in pre-backup in mysqldump [SME: 7827]
36    
37    * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
38    - expand 10mysql_upgrade and restart mysql.init on e-smith-mysql-update [SME: 11120]
39      this to make sure mariadb upgrade fully and prevent residual 10mysql_upgrade stay in the way
40    
41    * Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
42    - fix issue with 10mysql_upgrade crashing mariadb [SME: 11120]
43      also removed noise from spec file
44    
45    * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
46  - e-smith-update event [SME: 11145]  - e-smith-update event [SME: 11145]
47  - mariadb systemd integration [SME: 11021]  - mariadb systemd integration [SME: 11021]
48    move set.password and template    move set.password and template
49    create /usr/lib/systemd/system/mariadb.service.d/sme.conf    create /usr/lib/systemd/system/mariadb.service.d/sme.conf
50    create /sbin/e-smith/systemd/mariadb-initialize + chmod    create /sbin/e-smith/systemd/mariadb-initialize + chmod
51    cleanup    cleanup and remove old /var/service/mariadb
52  - mysql.init systemd integration [SME: 11120]  - mysql.init systemd integration [SME: 11120]
53    create mysql_init.service    create mysql_init.service
54    
# Line 785  rm -rf root/var/run/ Line 797  rm -rf root/var/run/
797  rm -rf root/var/log/mysqld  rm -rf root/var/log/mysqld
798  rm -f root/etc/rc.d/init.d/supervise/mysqld  rm -f root/etc/rc.d/init.d/supervise/mysqld
799  rm -f root/etc/rc.d/rc7.d/S50mysqld  rm -f root/etc/rc.d/rc7.d/S50mysqld
   
800  mkdir -p root/var/log/mariadb.run  mkdir -p root/var/log/mariadb.run
801  %patch6 -p1  %patch6 -p1
802  # move mariadb to systemd  # move mariadb to systemd
# Line 796  rm -rf root/var/service Line 807  rm -rf root/var/service
807  rm -rf root/service  rm -rf root/service
808  rm -rf root/etc/rc.d/init.d/supervise  rm -rf root/etc/rc.d/init.d/supervise
809  rm -rf root/var/log  rm -rf root/var/log
   
810  # move mysql.init  # move mysql.init
811  %patch8 -p1  %patch8 -p1
812  rm -rf root/etc/rc.d/rc7.d  rm -rf root/etc/rc.d/rc7.d
813    %patch9 -p1
814    
815  %build  %build
816  perl createlinks  perl createlinks
# Line 809  rm -rf $RPM_BUILD_ROOT Line 820  rm -rf $RPM_BUILD_ROOT
820  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
821  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
822      --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)' \  
823      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
824      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
825      > %{name}-%{version}-filelist      > %{name}-%{version}-filelist
# Line 828  if [ $1 -gt 1 ] ; then Line 833  if [ $1 -gt 1 ] ; then
833    if [ -e /var/service/mariadb/run ] ; then    if [ -e /var/service/mariadb/run ] ; then
834          /usr/bin/sv d mariadb          /usr/bin/sv d mariadb
835          /usr/bin/sv d mariadb/log          /usr/bin/sv d mariadb/log
         # also rm -rf /var/service/mariadb  
836    fi    fi
837  fi  fi
838    

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