From 01dbb03e4bd819986f7b5338f79440209ee220d7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 13 Jan 2018 09:25:00 -0600 Subject: [PATCH] make that cmake-data (where -rpm-macros was split from) --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 01d243c..1b4d064 100644 --- a/cmake.spec +++ b/cmake.spec @@ -252,7 +252,7 @@ The %{name}-gui package contains the Qt based GUI for %{name}. Summary: Common RPM macros for %{name} Requires: rpm # when subpkg introduced -Conflicts: cmake < 3.10.1-2 +Conflicts: cmake-data < 3.10.1-2 BuildArch: noarch @@ -518,7 +518,7 @@ 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) +- -rpm-macros: Conflicts: cmake-data < 3.10.1-2 (#1532293) * Tue Jan 02 2018 Sandro Mani - 3.10.1-8 - Add dl to CMAKE_DL_LIBS on MINGW