Skip to content

Commit 86e80f9

Browse files
committed
cmake: don't do fake rpm Provides
instead remove internal modules from Requires/Provides
1 parent 39cea72 commit 86e80f9

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

cmake/cpack_rpm.cmake

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "
6767
%define _bindir ${INSTALL_BINDIRABS}
6868
%define _sbindir ${INSTALL_SBINDIRABS}
6969
%define _sysconfdir ${INSTALL_SYSCONFDIR}
70+
71+
%{?filter_setup:
72+
%filter_from_provides /perl(\\\\(mtr\\\\|My::\\\\)/d
73+
%filter_from_requires /\\\\(lib\\\\(ft\\\\|lzma\\\\|tokuportability\\\\)\\\\)\\\\|\\\\(perl(\\\\(.*mtr\\\\|My::\\\\|.*HandlerSocket\\\\|Mysql\\\\)\\\\)/d
74+
%filter_setup
75+
}
7076
")
7177

7278
# this creative hack is described here: http://www.cmake.org/pipermail/cmake/2012-January/048416.html
@@ -225,36 +231,6 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
225231
SET(CPACK_RPM_common_PACKAGE_CONFLICTS "mariadb-libs < 1:%{version}-%{release}")
226232
ENDIF()
227233

228-
# workaround for lots of perl dependencies added by rpmbuild
229-
SETA(CPACK_RPM_test_PACKAGE_PROVIDES
230-
"perl(lib::mtr_gcov.pl)"
231-
"perl(lib::mtr_gprof.pl)"
232-
"perl(lib::mtr_io.pl)"
233-
"perl(lib::mtr_misc.pl)"
234-
"perl(lib::mtr_process.pl)"
235-
"perl(lib::v1/mtr_cases.pl)"
236-
"perl(lib::v1/mtr_gcov.pl)"
237-
"perl(lib::v1/mtr_gprof.pl)"
238-
"perl(lib::v1/mtr_im.pl)"
239-
"perl(lib::v1/mtr_io.pl)"
240-
"perl(lib::v1/mtr_match.pl)"
241-
"perl(lib::v1/mtr_misc.pl)"
242-
"perl(lib::v1/mtr_process.pl)"
243-
"perl(lib::v1/mtr_report.pl)"
244-
"perl(lib::v1/mtr_stress.pl)"
245-
"perl(lib::v1/mtr_timer.pl)"
246-
"perl(lib::v1/mtr_unique.pl)"
247-
"perl(mtr_cases)"
248-
"perl(mtr_io.pl)"
249-
"perl(mtr_match)"
250-
"perl(mtr_misc.pl)"
251-
"perl(mtr_gcov.pl)"
252-
"perl(mtr_gprof.pl)"
253-
"perl(mtr_process.pl)"
254-
"perl(mtr_report)"
255-
"perl(mtr_results)"
256-
"perl(mtr_unique)")
257-
258234
# If we want to build build MariaDB-shared-compat,
259235
# extract compat libraries from MariaDB-shared-5.3 rpm
260236
FILE(GLOB compat_rpm RELATIVE ${CMAKE_SOURCE_DIR}

0 commit comments

Comments
 (0)