diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:29:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:32:21 +0300 |
| commit | dbc716675b183dc972a40dd1320f4bdae04c1f29 (patch) | |
| tree | 65550afccea8fc9e0d47ba16a679eef44c7dab1a /cmake | |
| parent | e3f44d8d0eb0277312391686672f81a460094917 (diff) | |
| parent | c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff) | |
| download | mariadb-git-dbc716675b183dc972a40dd1320f4bdae04c1f29.tar.gz | |
Merge 10.1 into 10.2
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 7aefdce9bf0..4edcf8eee5d 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 |