(branch) backport recent cmake changes from fedora

epel8
Rex Dieter 5 years ago
parent 4a7d4030c4
commit 014c8d6ea0

@ -1,6 +1,6 @@
Name: kf5
Version: 5.68.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Filesystem and RPM macros for KDE Frameworks 5
License: BSD
URL: http://www.kde.org
@ -51,8 +51,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
sed -i \
-e "s|@@KF5_VERSION@@|%{version}|g" \
%if 0%{?rhel} || 0%{?rhel} > 7
-e 's|rhel:%{__cmake3}|rhel:%{__cmake}|' \
%if 0%{?rhel} && 0%{?rhel} < 8
-e 's|%{__cmake}|%{__cmake3}|' \
%endif
%{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
@ -80,6 +80,9 @@ sed -i \
%changelog
* Tue Aug 25 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-2
- (branch) backport recent cmake changes from fedora
* Thu Mar 19 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-1
- 5.68

@ -16,13 +16,16 @@
%_kf5_version @@KF5_VERSION@@
%cmake_kf5 \
%undefine __cmake_in_source_build \
QTDIR="%{_qt5_prefix}" ; export QTDIR ; \
PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
%{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\
%{__cmake} \\\
%{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\
%{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\

Loading…
Cancel
Save