--- rpms/smeserver-mysql57/contribs10/smeserver-mysql57.spec 2022/02/23 22:19:15 1.3 +++ rpms/smeserver-mysql57/contribs10/smeserver-mysql57.spec 2022/02/24 03:11:58 1.4 @@ -117,6 +117,8 @@ 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 rm -rf root/service +rm -rf root/etc/e-smith/templates/opt +rm -rf root/etc/e-smith/templates/var/service %install rm -rf $RPM_BUILD_ROOT @@ -126,9 +128,13 @@ rm -rf $RPM_BUILD_ROOT --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)' \ +| grep -vP '/opt/rh/rh-mysql57$' \ +| grep -vP '/opt/rh/rh-mysql57/root$' \ > %{name}-%{version}-filelist #--dir /var/run/mysql57-mysqld 'attr(0757,mysql,mysql)' \ echo "%doc COPYING" >> %{name}-%{version}-filelist +# /opt/rh/rh-mysql57 and /opt/rh/rh-mysql57/root conflicts + %clean rm -rf $RPM_BUILD_ROOT