heliocastro pushed to libqtxdg (f20). "el6 love (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 12 22:04:13 UTC 2015


>From 15fe6d99a5b38583986a877b8df426b3c1f25801 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 9 Oct 2014 12:47:06 -0500
Subject: el6 love

el6 requires a little hackery to use a newer cmake, packaged as cmake28

diff --git a/libqtxdg.spec b/libqtxdg.spec
index ada4ed7..9493ae1 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -2,6 +2,12 @@
 %bcond_without qt4
 %bcond_without qt5
 
+%if 0%{?rhel} == 6
+%define cmake_pkg cmake28
+%else
+%define cmake_pkg cmake
+%endif
+
 Name:           libqtxdg
 Summary:        Qt4 implementation of desktop specifications
 Version:        0.5.3
@@ -11,7 +17,7 @@ License:        LGPLv2+
 URL:            https://github.com/lxde/libqtxdg
 Source0:        http://lxqt.org/downloads/%{name}/%{version}/%{name}-%{version}.tar.xz
 
-BuildRequires:  cmake >= 2.8.3
+BuildRequires:  %{cmake_pkg} >= 2.8.3
 BuildRequires:  file-devel
 %if %with qt4
 BuildRequires:  pkgconfig(QtCore)
@@ -65,7 +71,7 @@ Files used for developing and building software that uses Qt5Xdg.
 %if %with qt4
 mkdir build-qt4
 cd build-qt4
-%cmake ..
+%{?cmake28}%{!?cmake28:%{?cmake}} ..
 make %{?_smp_mflags}
 cd ..
 %endif
@@ -73,7 +79,7 @@ cd ..
 %if %with qt5
 mkdir build-qt5
 cd build-qt5
-%cmake -DUSE_QT5=Yes ..
+%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=Yes ..
 make %{?_smp_mflags}
 cd ..
 %endif
@@ -92,7 +98,9 @@ make -C build-qt5 install DESTDIR=%{buildroot}
 
 mv libqtxdg.lang libqtxdg-all.lang
 grep "%{_datadir}/libqtxdg/"  libqtxdg-all.lang > libqtxdg.lang
+%if %with qt5
 grep "%{_datadir}/libqt5xdg/" libqtxdg-all.lang > libqtxdg-qt5.lang
+%endif
 
 
 %if %with qt4
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libqtxdg.git/commit/?h=f20&id=15fe6d99a5b38583986a877b8df426b3c1f25801


More information about the scm-commits mailing list