/[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.14 by unnilennium, Sun Jul 24 15:20:03 2016 UTC Revision 1.21 by jpp, Sun Dec 13 22:09:39 2020 UTC
# Line 1  Line 1 
1  # $Id: e-smith-mysql.spec,v 1.13 2016/07/23 06:24:27 stephdl Exp $  # $Id: e-smith-mysql.spec,v 1.20 2020/12/10 04:25:50 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 13  %define release 17
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 16  Patch2: e-smith-mysql-2.6.0-use_default_ Line 16  Patch2: e-smith-mysql-2.6.0-use_default_
16  Patch3: e-smith-mysql-2.6.0-mariadb_forgotten_var.patch  Patch3: e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
17  Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch  Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
18  Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch  Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch
19    Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch
20    Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
21    Patch8: e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch
22    
23  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
24  BuildArchitectures: noarch  BuildArchitectures: noarch
25  Requires: mariadb-server  Requires: mariadb-server
# Line 26  BuildRequires: e-smith-devtools >= 1.13. Line 30  BuildRequires: e-smith-devtools >= 1.13.
30  AutoReqProv: no  AutoReqProv: no
31    
32  %changelog  %changelog
33    * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
34    - expand 10mysql_upgrade and restart mysql.init on e-smith-mysql-update [SME: 11120]
35      this to make sure mariadb upgrade fully and prevent residual 10mysql_upgrade stay in the way
36    
37    * Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
38    - fix issue with 10mysql_upgrade crashing mariadb [SME: 11120]
39      also removed noise from spec file
40    
41    * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
42    - e-smith-update event [SME: 11145]
43    - mariadb systemd integration [SME: 11021]
44      move set.password and template
45      create /usr/lib/systemd/system/mariadb.service.d/sme.conf
46      create /sbin/e-smith/systemd/mariadb-initialize + chmod
47      cleanup and remove old /var/service/mariadb
48    - mysql.init systemd integration [SME: 11120]
49      create mysql_init.service
50    
51    
52  * Sun Jul 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme  * Sun Jul 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
53  - systemd skip redirect [SME: 9688]  - systemd skip redirect [SME: 9688]
54    
# Line 762  mysql. Line 785  mysql.
785  %patch3 -p1  %patch3 -p1
786  %patch4 -p1  %patch4 -p1
787  %patch5 -p1  %patch5 -p1
   
788  # mysqld renamed to mariadb [SME: 9438]  # mysqld renamed to mariadb [SME: 9438]
789  # TODO: remove on next tarball creation  # TODO: remove on next tarball creation
790  rm -f root/service/mysqld  rm -f root/service/mysqld
# Line 773  rm -f root/etc/rc.d/init.d/supervise/mys Line 795  rm -f root/etc/rc.d/init.d/supervise/mys
795  rm -f root/etc/rc.d/rc7.d/S50mysqld  rm -f root/etc/rc.d/rc7.d/S50mysqld
796    
797  mkdir -p root/var/log/mariadb.run  mkdir -p root/var/log/mariadb.run
798    %patch6 -p1
799    # move mariadb to systemd
800    %patch7 -p1
801    rm -rf root/etc/e-smith/templates.metadata/var/service
802    rm -rf root/etc/e-smith/templates/var/service/mariadb
803    rm -rf root/var/service
804    rm -rf root/service
805    rm -rf root/etc/rc.d/init.d/supervise
806    rm -rf root/var/log
807    
808    # move mysql.init
809    %patch8 -p1
810    rm -rf root/etc/rc.d/rc7.d
811    
812  %build  %build
813  perl createlinks  perl createlinks
# Line 781  perl createlinks Line 816  perl createlinks
816  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
817  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
818  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
819      --file /var/service/mariadb/run 'attr(0755,root,root)' \      --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,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)' \  
820      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
821      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
822      > %{name}-%{version}-filelist      > %{name}-%{version}-filelist
# Line 795  echo "%doc COPYING"          >> %{name}- Line 825  echo "%doc COPYING"          >> %{name}-
825  %clean  %clean
826  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
827    
828    %pre
829    if [ $1 -gt 1 ] ; then
830      if [ -e /var/service/mariadb/run ] ; then
831            /usr/bin/sv d mariadb
832            /usr/bin/sv d mariadb/log
833      fi
834    fi
835    
836  %post  %post
837    
838  %postun  %postun

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