diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:42:11 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 11:43:39 +0300 |
commit | c8f8d5ceb7227ff825f86ea2d61dd1edd9e610b2 (patch) | |
tree | ca46d8cbae14a7bd788d87c200e2941637e92728 /cmake | |
parent | 5f31f8cc87c6fc108f6089a18895466b936dfe72 (diff) | |
parent | c6b8b05be48d7cc7a3a46063bf4dee269d7d5609 (diff) | |
download | mariadb-git-c8f8d5ceb7227ff825f86ea2d61dd1edd9e610b2.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/cpack_rpm.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index fd2998a8608..87c5518de6b 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -85,6 +85,8 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE " %define restart_flag %{restart_flag_dir}/need-restart %{?filter_setup: +%filter_provides_in \\\\.\\\\(test\\\\|result\\\\|h\\\\|cc\\\\|c\\\\|inc\\\\|opt\\\\|ic\\\\|cnf\\\\|rdiff\\\\|cpp\\\\)$ +%filter_requires_in \\\\.\\\\(test\\\\|result\\\\|h\\\\|cc\\\\|c\\\\|inc\\\\|opt\\\\|ic\\\\|cnf\\\\|rdiff\\\\|cpp\\\\)$ %filter_from_provides /perl(\\\\(mtr\\\\|My::\\\\)/d %filter_from_requires /\\\\(lib\\\\(ft\\\\|lzma\\\\|tokuportability\\\\)\\\\)\\\\|\\\\(perl(\\\\(.*mtr\\\\|My::\\\\|.*HandlerSocket\\\\|Mysql\\\\)\\\\)/d %filter_setup |