rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Include README.mysql-cnf

Browse Source
This commit is contained in:
Honza Horak 2014-07-17 15:57:42 +02:00
parent aed899f509
commit 9e778c02ee
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.mysql-cnf Normal file
View File

@ -0,0 +1,13 @@
This directory contains prepared configuration files with .cnf extension,
which provide a configuration for some common MariaDB deployment scenarios.
These configuration files do not include the default configuration of datadir,
log-file and pid-file locations, as specified in the default my.cnf file,
provided in this distribution.
Thus, it is recommended to use these configuration files as an addition to the
default my.cnf configuration file.
Since default my.cnf contains `!includedir /etc/my.cnf.d` directive, it is
recommended to copy required configuration under /etc/my.cnf.d/ directory,
so the default my.cnf specifications will be extended.

15
mariadb.spec
View File

@ -53,7 +53,8 @@ License: GPLv2 with exceptions and LGPLv2 and BSD
Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz
Source3: my.cnf Source3: my.cnf
Source5: my_config.h Source4: my_config.h
Source5: README.mysql-cnf
Source6: README.mysql-docs Source6: README.mysql-docs
Source7: README.mysql-license Source7: README.mysql-license
Source8: libmysql.version Source8: libmysql.version
@ -460,14 +461,14 @@ case `uname -i` in
i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 | aarch64 ) i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 | aarch64 )
mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -i`.h mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -i`.h
mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_`uname -i`.h mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_`uname -i`.h
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_includedir}/mysql/
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h
;; ;;
arm* ) arm* )
mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_arm.h mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_arm.h
mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_arm.h mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_arm.h
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_includedir}/mysql/
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h
;; ;;
*) *)
;; ;;
@ -562,6 +563,7 @@ echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
# copy additional docs into build tree so %%doc will find them # copy additional docs into build tree so %%doc will find them
cp -p %{SOURCE6} README.mysql-docs cp -p %{SOURCE6} README.mysql-docs
cp -p %{SOURCE7} README.mysql-license cp -p %{SOURCE7} README.mysql-license
cp -p %{SOURCE16} README.mysql-cnf
# install the list of skipped tests to be available for user runs # install the list of skipped tests to be available for user runs
install -p -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test install -p -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test
@ -723,7 +725,7 @@ fi
%{_datadir}/%{name}/charsets %{_datadir}/%{name}/charsets
%files server %files server
%doc support-files/*.cnf %doc support-files/*.cnf README.mysql-cnf
%{_bindir}/myisamchk %{_bindir}/myisamchk
%{_bindir}/myisam_ftdump %{_bindir}/myisam_ftdump
@ -858,6 +860,7 @@ fi
- Drop superfluous -libs and -embedded ldconfig deps (thanks Ville Skyttä) - Drop superfluous -libs and -embedded ldconfig deps (thanks Ville Skyttä)
- Separate -lib and -common sub-packages - Separate -lib and -common sub-packages
- Require /etc/my.cnf instead of shipping it - Require /etc/my.cnf instead of shipping it
- Include README.mysql-cnf
* Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-2 * Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-2
- Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9 - Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9