From 10402ba1d7d370d7f0d651ed63730b22698cf654 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Dec 04 2016 02:04:56 +0000 Subject: Move patch from specfile to standalone patch file Related: #1382988 --- diff --git a/mariadb-example-config-files.patch b/mariadb-example-config-files.patch new file mode 100644 index 0000000..d4bf5be --- /dev/null +++ b/mariadb-example-config-files.patch @@ -0,0 +1,56 @@ +diff -Naurp mariadb-10.1.19/support-files/my-huge.cnf.sh mariadb-10.1.19-patched/support-files/my-huge.cnf.sh +--- mariadb-10.1.19/support-files/my-huge.cnf.sh 2016-11-04 12:15:54.000000000 +0100 ++++ mariadb-10.1.19-patched/support-files/my-huge.cnf.sh 2016-12-02 10:29:41.111798361 +0100 +@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++log-error = @LOG_LOCATION@ + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-external-locking +diff -Naurp mariadb-10.1.19/support-files/my-innodb-heavy-4G.cnf.sh mariadb-10.1.19-patched/support-files/my-innodb-heavy-4G.cnf.sh +--- mariadb-10.1.19/support-files/my-innodb-heavy-4G.cnf.sh 2016-11-04 12:15:54.000000000 +0100 ++++ mariadb-10.1.19-patched/support-files/my-innodb-heavy-4G.cnf.sh 2016-12-02 10:30:07.647805999 +0100 +@@ -42,7 +42,7 @@ socket = @MYSQL_UNIX_ADDR@ + # The MariaDB server + # + [mysqld] +- ++log-error = @LOG_LOCATION@ + # generic configuration options + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ +diff -Naurp mariadb-10.1.19/support-files/my-large.cnf.sh mariadb-10.1.19-patched/support-files/my-large.cnf.sh +--- mariadb-10.1.19/support-files/my-large.cnf.sh 2016-11-04 12:15:54.000000000 +0100 ++++ mariadb-10.1.19-patched/support-files/my-large.cnf.sh 2016-12-02 10:30:14.744806845 +0100 +@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MariaDB server + [mysqld] ++log-error = @LOG_LOCATION@ + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-external-locking +diff -Naurp mariadb-10.1.19/support-files/my-medium.cnf.sh mariadb-10.1.19-patched/support-files/my-medium.cnf.sh +--- mariadb-10.1.19/support-files/my-medium.cnf.sh 2016-11-04 12:15:54.000000000 +0100 ++++ mariadb-10.1.19-patched/support-files/my-medium.cnf.sh 2016-12-02 10:30:21.726807677 +0100 +@@ -26,6 +26,7 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MariaDB server + [mysqld] ++log-error = @LOG_LOCATION@ + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-external-locking +diff -Naurp mariadb-10.1.19/support-files/my-small.cnf.sh mariadb-10.1.19-patched/support-files/my-small.cnf.sh +--- mariadb-10.1.19/support-files/my-small.cnf.sh 2016-11-04 12:15:54.000000000 +0100 ++++ mariadb-10.1.19-patched/support-files/my-small.cnf.sh 2016-12-02 10:30:27.988808423 +0100 +@@ -24,6 +24,7 @@ socket = @MYSQL_UNIX_ADDR@ + + # The MySQL server + [mysqld] ++log-error = @LOG_LOCATION@ + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ + skip-external-locking diff --git a/mariadb.spec b/mariadb.spec index 56ee54b..3843c07 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -170,6 +170,7 @@ Patch8: %{pkgnamepatch}-install-db-sharedir.patch Patch9: %{pkgnamepatch}-ownsetup.patch Patch12: %{pkgnamepatch}-admincrash.patch Patch13: %{pkgnamepatch}-ssl-cypher.patch +Patch14: %{pkgnamepatch}-example-config-files.patch # Patches specific for this mysql package Patch30: %{pkgnamepatch}-errno.patch @@ -578,6 +579,7 @@ MariaDB is a community developed branch of MySQL. %patch9 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 @@ -880,9 +882,6 @@ mv Docs/README-wsrep Docs/README.wsrep # remove *.jar file from mysql-test rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar -# -echo -e "\n\nlog-error=/var/log/mariadb/mariadb.log\n" | tee -a %{buildroot}/usr/share/mariadb/*.cnf - %if %{without clibrary} unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so @@ -1338,6 +1337,10 @@ fi %endif %changelog +* Fri Dec 02 2016 Michal Schorm - 3:10.1.19-6 +- Move patch from specfile to standalone patch file + Related: #1382988 + * Thu Dec 01 2016 Rex Dieter - 3:10.1.19-6 - -devel: use pkgconfig(openssl) to allow any implementation (like compat-openssl10)