/[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.16 by jpp, Tue Dec 8 03:26:23 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.15 2020/12/08 02:55:37 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 14
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    
22  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
23  BuildArchitectures: noarch  BuildArchitectures: noarch
24  Requires: mariadb-server  Requires: mariadb-server
# Line 26  BuildRequires: e-smith-devtools >= 1.13. Line 29  BuildRequires: e-smith-devtools >= 1.13.
29  AutoReqProv: no  AutoReqProv: no
30    
31  %changelog  %changelog
32    * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
33    - e-smith-update event [SME: 11145]
34    - mariadb systemd integration [SME: 11021]
35      move set.password and template
36      create /usr/lib/systemd/system/mariadb.service.d/sme.conf
37      create /sbin/e-smith/systemd/mariadb-initialize + chmod
38      cleanup
39    - mysql.init systemd integration [SME: 11120]
40      create mysql_init.service
41    
42    
43  * 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
44  - systemd skip redirect [SME: 9688]  - systemd skip redirect [SME: 9688]
45    
# Line 762  mysql. Line 776  mysql.
776  %patch3 -p1  %patch3 -p1
777  %patch4 -p1  %patch4 -p1
778  %patch5 -p1  %patch5 -p1
   
779  # mysqld renamed to mariadb [SME: 9438]  # mysqld renamed to mariadb [SME: 9438]
780  # TODO: remove on next tarball creation  # TODO: remove on next tarball creation
781  rm -f root/service/mysqld  rm -f root/service/mysqld
# Line 773  rm -f root/etc/rc.d/init.d/supervise/mys Line 786  rm -f root/etc/rc.d/init.d/supervise/mys
786  rm -f root/etc/rc.d/rc7.d/S50mysqld  rm -f root/etc/rc.d/rc7.d/S50mysqld
787    
788  mkdir -p root/var/log/mariadb.run  mkdir -p root/var/log/mariadb.run
789    %patch6 -p1
790    # move mariadb to systemd
791    %patch7 -p1
792    rm -rf root/etc/e-smith/templates.metadata/var/service
793    rm -rf root/etc/e-smith/templates/var/service/mariadb
794    rm -rf root/var/service
795    rm -rf root/service
796    rm -rf root/etc/rc.d/init.d/supervise
797    
798    
799  %build  %build
800  perl createlinks  perl createlinks
# Line 781  perl createlinks Line 803  perl createlinks
803  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
804  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
805  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
806        --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \
807      --file /var/service/mariadb/run 'attr(0755,root,root)' \      --file /var/service/mariadb/run 'attr(0755,root,root)' \
808      --file /var/service/mariadb/control/t 'attr(0750,root,root)' \      --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
809      --file /var/service/mariadb/control/d 'attr(0750,root,root)' \      --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
# Line 795  echo "%doc COPYING"          >> %{name}- Line 818  echo "%doc COPYING"          >> %{name}-
818  %clean  %clean
819  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
820    
821    %pre
822    if [ $1 -gt 1 ] ; then
823      if [ -e /var/service/mariadb/run ] ; then
824            /usr/bin/sv d mariadb
825            /usr/bin/sv d mariadb/log
826      fi
827    fi
828    
829  %post  %post
830    
831  %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