From f62ee9a360c5722cd42a9694daeb418ea709b28d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 13 Jan 2018 09:20:49 -0600 Subject: [PATCH] -rpm-macros: Conflicts: cmake < 3.10.1-2 (#1532293) when new -rpm-macros subpkg was introduced, helps avoid conflicts. --- cmake.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 094ca20..01d243c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -66,7 +66,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.1 -Release: 8%{?relsuf}%{?dist} +Release: 9%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -251,6 +251,8 @@ The %{name}-gui package contains the Qt based GUI for %{name}. %package rpm-macros Summary: Common RPM macros for %{name} Requires: rpm +# when subpkg introduced +Conflicts: cmake < 3.10.1-2 BuildArch: noarch @@ -515,6 +517,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Jan 13 2018 Rex Dieter 3.10.1-9 +- -rpm-macros: Conflicts: cmake < 3.10.1-2 (#1532293) + * Tue Jan 02 2018 Sandro Mani - 3.10.1-8 - Add dl to CMAKE_DL_LIBS on MINGW