parent
7b008c4d2a
commit
0a354ab64e
38
community-mysql-install-db-sharedir.patch
Normal file
38
community-mysql-install-db-sharedir.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
Use configured value instead of hardcoded path
|
||||||
|
|
||||||
|
diff -up mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.0.13/scripts/mysql_install_db.pl.in
|
||||||
|
--- mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir 2014-09-04 12:50:24.061979080 +0200
|
||||||
|
+++ mariadb-10.0.13/scripts/mysql_install_db.pl.in 2014-09-04 12:51:22.929045559 +0200
|
||||||
|
@@ -318,7 +318,7 @@ elsif ( $opt->{basedir} )
|
||||||
|
find_in_basedir($opt,"file","mysqld-nt",
|
||||||
|
"bin"); # ,"sql"
|
||||||
|
$pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
|
||||||
|
- "share","share/mysql"); # ,"scripts"
|
||||||
|
+ "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts"
|
||||||
|
$scriptdir = "$opt->{basedir}/scripts";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/scripts/mysql_install_db.sh
|
||||||
|
--- mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir 2014-09-04 12:51:59.005086301 +0200
|
||||||
|
+++ mariadb-10.0.13/scripts/mysql_install_db.sh 2014-09-04 12:54:02.794222597 +0200
|
||||||
|
@@ -280,16 +280,16 @@ then
|
||||||
|
cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
|
||||||
|
+ langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english`
|
||||||
|
if test -z "$langdir"
|
||||||
|
then
|
||||||
|
- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
|
||||||
|
+ cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
|
||||||
|
+ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
|
||||||
|
if test -z "$pkgdatadir"
|
||||||
|
then
|
||||||
|
- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
|
||||||
|
+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
scriptdir="$basedir/scripts"
|
@ -59,7 +59,7 @@
|
|||||||
|
|
||||||
Name: %{pkgname}
|
Name: %{pkgname}
|
||||||
Version: 5.6.20
|
Version: 5.6.20
|
||||||
Release: 4%{?dist}
|
Release: 5%{?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
|
||||||
@ -94,7 +94,8 @@ Patch5: %{pkgnamepatch}-cipherspec.patch
|
|||||||
Patch6: %{pkgnamepatch}-file-contents.patch
|
Patch6: %{pkgnamepatch}-file-contents.patch
|
||||||
Patch7: %{pkgnamepatch}-dh1024.patch
|
Patch7: %{pkgnamepatch}-dh1024.patch
|
||||||
Patch8: %{pkgnamepatch}-scripts.patch
|
Patch8: %{pkgnamepatch}-scripts.patch
|
||||||
Patch9: %{pkgnamepatch}-paths.patch
|
Patch9: %{pkgnamepatch}-install-db-sharedir.patch
|
||||||
|
Patch10: %{pkgnamepatch}-paths.patch
|
||||||
|
|
||||||
# Patches specific for this mysql package
|
# Patches specific for this mysql package
|
||||||
Patch50: %{pkgnamepatch}-expired-certs.patch
|
Patch50: %{pkgnamepatch}-expired-certs.patch
|
||||||
@ -352,6 +353,7 @@ the MySQL sources.
|
|||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
|
%patch10 -p1
|
||||||
%patch50 -p1
|
%patch50 -p1
|
||||||
%patch51 -p1
|
%patch51 -p1
|
||||||
%patch52 -p1
|
%patch52 -p1
|
||||||
@ -898,6 +900,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 04 2014 Honza Horak <hhorak@redhat.com> - 5.6.20-5
|
||||||
|
- Fix paths in mysql_install_db script
|
||||||
|
Related: #1134328
|
||||||
|
|
||||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.20-4
|
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.20-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user