summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg.bruehe@oracle.com>2012-11-07 20:32:54 +0100
committerJoerg Bruehe <joerg.bruehe@oracle.com>2012-11-07 20:32:54 +0100
commita4e7094e88d0e8783ee019fc58c41b43e816712b (patch)
tree63eb74cb81fc2478ceaefa73c81889b68a366036 /packaging
parent7e613db478c98c32e4bdcf2ffe72742bb9416f7a (diff)
downloadmariadb-git-a4e7094e88d0e8783ee019fc58c41b43e816712b.tar.gz
Make RPMs for ULN build again.
A change to "vio/viosslfactories.c" in August, 2012, broke a patch which is to be applied during the build of ULN RPMs. The patch file is "packaging/rpm-uln/mysql-chain-certs.patch" This change bypasses the problem by not trying to apply the patch. This is a regression and must be fixed, not bypassed.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm-uln/mysql.spec.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/rpm-uln/mysql.spec.sh b/packaging/rpm-uln/mysql.spec.sh
index 8b25b160be1..93ba78eb56a 100644
--- a/packaging/rpm-uln/mysql.spec.sh
+++ b/packaging/rpm-uln/mysql.spec.sh
@@ -244,7 +244,8 @@ Patch13: mysql-expired-certs.patch
# Will not be used by MySQL
# Patch14: mysql-missing-string-code.patch Undecided, will not work in 5.5 (cmake)
# Patch15: mysql-lowercase-bug.patch Fixed in MySQL 5.1.54 and 5.5.9
-Patch16: mysql-chain-certs.patch
+# Patch16: mysql-chain-certs.patch Currently, this patch is broken
+# by server code changes to "vio/viosslfactories.c"
Patch17: mysql-5.5-libdir.patch
Patch18: mysql-5.5-fix-tests.patch
Patch19: mysql-5.5-mtr1.patch
@@ -399,7 +400,8 @@ cd %{src_dir} # read about "%setup -n"
# %patch10 -p1
# %patch13 -p1
# %patch14 -p1
-%patch16 -p1
+# %patch16 -p1 Currently, this patch is broken
+# by server code changes to "vio/viosslfactories.c"
%patch17 -p1
%patch18 -p1
%patch19 -p1