--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/04/02 21:58:15 1.24 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/04/09 18:22:07 1.26 @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 12 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -10,6 +10,7 @@ Group: Networking/Daemons Source: %{name}-%{version}.tar.xz Patch0: smeserver-mysql-2.7.0-bz11899-sclo.patch Patch1: smeserver-mysql-2.7.0-bz11922-mysqlinit.patch +Patch2: smeserver-mysql-2.7.0-bz11936.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -33,6 +34,7 @@ mysql. %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build for ver in 101 102 103 105 @@ -130,9 +132,9 @@ cp root/etc/e-smith/templates/etc/e-sm sed -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/00_restore_dumped_dbs -i root$ver/etc/e-smith/templates/etc/e-smith/sql/init$ver/10mysql_upgrade \ -e "s_e-smith/db/mysql_e-smith/db/mariadb${ver}_g" \ -e "s_/usr/bin/mysql_/opt/rh/rh-mariadb${ver}/root/usr/bin/mysql_g" \ - -e "s_mariadb.service_rh-mariadb$ver-mariadb.service_" \ + -e "s_mariadb.service_mariadb$ver-mariadb.service_" \ -e "s_/var/run/mariadb/mariadb.pid_${pidfile}_g" \ - -e "s_mysqld_rh-mariadb$ver-mariadb_g" \ + -e "s_mysqld_mariadb$ver-mariadb_g" \ -e "s_| mysql |_| /opt/rh/rh-mariadb${ver}/root/usr/bin/mysql --socket=$socket |_g" \ -e "s_mysql\_upgrade_mysql\_upgrade --socket=$socket _g" mkdir -p root$ver/etc/e-smith/templates/etc/my.cnf @@ -341,6 +343,9 @@ Koozali SME Server configuration package %changelog +* Sat Apr 09 2022 Jean-Philippe Pialasse 2.7.0-13.sme +- fix few typos [SME: 11936] + * Sat Apr 02 2022 Jean-Philippe Pialasse 2.7.0-12.sme - remove SourcePath from mysql-init service file [SME: 11922]