- Prepare to epel 7

9 years ago · f463780f78
parent 55bfcae441
commit f463780f78
2 changed files with 5 additions and 2 deletions
--- a/kf5.spec
+++ b/kf5.spec
@ -1,6 +1,6 @@
 Name:           kf5
 Version:        5.17.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
 License:        BSD
 URL:            http://www.kde.org
@ -58,6 +58,9 @@ sed -i \


 %changelog
+* Sun Dec 13 2015 Helio Chissini de Castro <helio@kde.org> - 5.17.0-2
+- Prepare to cmake3 epel
+
 * Tue Dec 08 2015 Daniel Vrátil <dvratil@fedoraproject.org> - 5.17.0-1
 - KDE Frameworks 5.17.0

--- a/macros.kf5
+++ b/macros.kf5
@ -21,7 +21,7 @@
  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %{__cmake} \\\
+  %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\
    -DBUILD_SHARED_LIBS:BOOL=ON \\\
    -DBUILD_TESTING:BOOL=FALSE \\\
    -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\