rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 824288 from server:database

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/824288
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=100
This commit is contained in:
Dominique Leuenberger 2020-08-06 15:30:18 +00:00 committed by Git OBS Bridge
commit d4d1e391fb
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mariadb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 3 07:49:32 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix installed .service files to follow the /usr/lib ->
/usr/libexec move (boo#1174811).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 9 14:38:20 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org> Tue Jun 9 14:38:20 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

6
mariadb.service → mariadb.service.in
View File

@ -32,9 +32,9 @@ WantedBy=multi-user.target
Alias=mysql.service Alias=mysql.service
[Service] [Service]
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper install
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper upgrade
ExecStart=/usr/lib/mysql/mysql-systemd-helper start ExecStart=@LIBEXECDIR@/mysql/mysql-systemd-helper start
Type=notify Type=notify
User=mysql User=mysql

8
mariadb.spec
View File

@ -65,10 +65,10 @@ Source5: suse-test-run
Source7: README.install Source7: README.install
Source12: mysql-user.conf Source12: mysql-user.conf
Source14: my.ini Source14: my.ini
Source15: mariadb.service Source15: mariadb.service.in
Source16: mariadb.target Source16: mariadb.target
Source17: mysql-systemd-helper Source17: mysql-systemd-helper
Source18: mariadb@.service Source18: mariadb@.service.in
Source19: macros.mariadb-test Source19: macros.mariadb-test
Source50: suse_skipped_tests.list Source50: suse_skipped_tests.list
Source51: mariadb-rpmlintrc Source51: mariadb-rpmlintrc
@ -627,8 +627,8 @@ sed -i 's|@MYSQLVER@|%{version}|' '%{buildroot}'%{_libexecdir}/mysql/mysql-syste
ln -sf service '%{buildroot}'%{_sbindir}/rcmysql ln -sf service '%{buildroot}'%{_sbindir}/rcmysql
ln -sf service '%{buildroot}'%{_sbindir}/rcmariadb ln -sf service '%{buildroot}'%{_sbindir}/rcmariadb
rm -rf '%{buildroot}'%{_sysconfdir}/init.d rm -rf '%{buildroot}'%{_sysconfdir}/init.d
install -D -m 644 %{_sourcedir}/mariadb.service '%{buildroot}'%{_unitdir}/mariadb.service sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{_sourcedir}/mariadb.service.in > '%{buildroot}'%{_unitdir}/mariadb.service
install -D -m 644 %{_sourcedir}/mariadb@.service '%{buildroot}'%{_unitdir}/mariadb@.service sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{_sourcedir}/mariadb@.service.in > '%{buildroot}'%{_unitdir}/mariadb@.service
install -D -m 644 %{_sourcedir}/mariadb.target '%{buildroot}'%{_unitdir}/mariadb.target install -D -m 644 %{_sourcedir}/mariadb.target '%{buildroot}'%{_unitdir}/mariadb.target
# Aliases for the backward compatibility. Create symlinks from the alias to the existing one # Aliases for the backward compatibility. Create symlinks from the alias to the existing one
# We can't use 'Alias=' option only because it's effective only when the unit is enabled # We can't use 'Alias=' option only because it's effective only when the unit is enabled

6
mariadb@.service → mariadb@.service.in
View File

@ -32,9 +32,9 @@ WantedBy=multi-user.target
Alias=mysql.service Alias=mysql.service
[Service] [Service]
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install %i ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper install %i
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade %i ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper upgrade %i
ExecStart=/usr/lib/mysql/mysql-systemd-helper start %i ExecStart=@LIBEXECDIR@/mysql/mysql-systemd-helper start %i
Type=notify Type=notify
User=mysql User=mysql