Remove duplicate tmpfiles.d file

Resolves: #1288216
This commit is contained in:
Honza Horak 2016-02-14 20:46:56 +01:00
parent 1998188345
commit 12f495c7ea

View File

@ -80,7 +80,7 @@
Name: community-mysql Name: community-mysql
Version: 5.7.11 Version: 5.7.11
Release: 1%{?with_debug:.debug}%{?dist} Release: 2%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
Group: Applications/Databases Group: Applications/Databases
URL: http://www.mysql.com URL: http://www.mysql.com
@ -671,7 +671,8 @@ install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
# install systemd unit files and scripts for handling server startup # install systemd unit files and scripts for handling server startup
%if %{with init_systemd} %if %{with init_systemd}
install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf
rm -rf %{buildroot}%{_tmpfilesdir}/mysql.conf
%endif %endif
# install SysV init script # install SysV init script
@ -1024,8 +1025,7 @@ fi
%{_libexecdir}/mysql-check-upgrade %{_libexecdir}/mysql-check-upgrade
%{_libexecdir}/mysql-scripts-common %{_libexecdir}/mysql-scripts-common
%{_tmpfilesdir}/mysql.conf %{?with_init_systemd:%{_tmpfilesdir}/%{daemon_name}.conf}
%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf}
%attr(0755,mysql,mysql) %dir %{dbdatadir} %attr(0755,mysql,mysql) %dir %{dbdatadir}
%attr(0750,mysql,mysql) %dir %{_localstatedir}/lib/mysql-files %attr(0750,mysql,mysql) %dir %{_localstatedir}/lib/mysql-files
%attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring %attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring
@ -1067,6 +1067,10 @@ fi
%endif %endif
%changelog %changelog
* Sun Feb 14 2016 Honza Horak <hhorak@redhat.com> - 5.7.11-2
- Remove duplicate tmpfiles.d file
Resolves: #1288216
* Thu Feb 11 2016 Honza Horak <hhorak@redhat.com> - 5.7.11-1 * Thu Feb 11 2016 Honza Horak <hhorak@redhat.com> - 5.7.11-1
- Update to 5.7.11 - Update to 5.7.11
Thanks to Norvald H. Ryeng Thanks to Norvald H. Ryeng