--- rpms/smeserver-mysql57/contribs10/smeserver-mysql57.spec 2022/02/23 19:04:13 1.1 +++ rpms/smeserver-mysql57/contribs10/smeserver-mysql57.spec 2022/02/23 21:14:00 1.2 @@ -2,7 +2,7 @@ Summary: smeserver specific mysql57 conf %define name smeserver-mysql57 Name: %{name} %define version 2.0.0 -%define release 12 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -18,6 +18,7 @@ Patch6: smeserver-mysql57-2.0.0-SME10148 Patch7: smeserver-mysql57-2.0.0-SME10197.patch Patch8: smeserver-mysql57-2.0.0-SME10202-prebackup.patch Patch9: smeserver-mysql57-2.0.0-SME10830-user.frm.patch +Patch10: smeserver-mysql57-2.0.0-bz11877-systemd.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -29,6 +30,12 @@ BuildRequires: e-smith-devtools >= 1.13. AutoReqProv: no %changelog +* Wed Feb 23 2022 Jean-Philippe Pialasse 2.0.0-13.sme +- adapt for SME10 [SME: 11877] + systemd service files + update event + changing paths + * Thu Nov 21 2019 Jean-Philipe Pialasse 2.0.0-12.sme - fix reload dump when should not [SME: 10830] @@ -83,45 +90,43 @@ mysql57. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build mkdir -p root/etc/e-smith/sql/init57 -mkdir -p root/opt/rh/rh-mysql57/root +#mkdir -p root/opt/rh/rh-mysql57/root perl createlinks # add this for mysql.com rpm compatibility #mkdir -p root/var/run/mysql57-mysqld # we hould we rather link to the actual dir in opt , done in createlinks -mkdir -p root/etc/rc.d/init.d/supervise -ln -s ../daemontools root/etc/rc.d/init.d/supervise/mysql57-mysqld +#mkdir -p root/etc/rc.d/init.d/supervise +#ln -s ../daemontools root/etc/rc.d/init.d/supervise/mysql57-mysqld -mkdir -p root/etc/rc.d/rc7.d -ln -s /etc/rc.d/init.d/e-smith-service root/etc/rc.d/rc7.d/S50mysql57-mysqld -ln -s /etc/rc.d/init.d/e-smith-service root/etc/rc.d/rc7.d/S99mysql57-mysql.init - -mkdir -p root/service -ln -s /var/service/mysql57-mysqld root/service -touch root/var/service/mysql57-mysqld/down +#mkdir -p root/etc/rc.d/rc7.d +#ln -s /etc/rc.d/init.d/e-smith-service root/etc/rc.d/rc7.d/S50mysql57-mysqld +#ln -s /etc/rc.d/init.d/e-smith-service root/etc/rc.d/rc7.d/S99mysql57-mysql.init + +#mkdir -p root/service +#ln -s /var/service/mysql57-mysqld root/service +#touch root/var/service/mysql57-mysqld/down +rm -rf root/var/service mkdir -p root/var/log/mysql57-mysqld mkdir -p root/home/e-smith/db/mysql57 - +rm -rf root/etc/e-smith/templates.metadata/var/service %install rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir /var/run/mysql57-mysqld 'attr(0757,mysql,mysql)' \ - --file /var/service/mysql57-mysqld/run 'attr(0757,root,root)' \ - --file /var/service/mysql57-mysqld/control/t 'attr(0750,root,root)' \ - --file /var/service/mysql57-mysqld/control/d 'attr(0750,root,root)' \ - --file /var/service/mysql57-mysqld/control/i 'attr(0750,root,root)' \ - --file /var/service/mysql57-mysqld/control/q 'attr(0750,root,root)' \ - --file /var/service/mysql57-mysqld/log/run 'attr(0757,root,root)' \ - --dir '/var/log/mysql57-mysqld' 'attr(2750,smelog,smelog)' \ - --dir '/home/e-smith/db/mysql57' 'attr(0750,root,root)' \ + --file /sbin/e-smith/systemd/mysql57-initialize 'attr(0757,mysql,mysql)' \ + --file /sbin/e-smith/systemd/mysql57-mysql.init 'attr(0757,mysql,mysql)' \ + --dir /var/log/mysql57-mysqld 'attr(2750,root,root)' \ + --dir /home/e-smith/db/mysql57 'attr(0750,root,root)' \ > %{name}-%{version}-filelist +#--dir /var/run/mysql57-mysqld 'attr(0757,mysql,mysql)' \ echo "%doc COPYING" >> %{name}-%{version}-filelist %clean