[kdelibs] el6 fixes
Rex Dieter
rdieter at fedoraproject.org
Mon Oct 21 13:03:01 UTC 2013
commit 8207dace25a1f6ac3ae837266038f3915a638852
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Oct 21 08:02:28 2013 -0500
el6 fixes
- bump udev dep
- fix LEGACY_HAL handling
kdelibs.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 55b5857..b9d4e5d 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -20,10 +20,10 @@
%endif
%if 0%{?rhel} == 6
%define hal 1
-Source10: SOLID_HAL_LEGACY.sh
%define cmake_pkg cmake28
%else
%define cmake_pkg cmake
+%define udev 1
%define upower 1
%endif
@@ -57,6 +57,8 @@ URL: http://www.kde.org/
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/kdelibs-%{version}.tar.xz
+Source10: SOLID_HAL_LEGACY.sh
+
BuildRequires: kde4-macros(api) >= 2
BuildRequires: kde-filesystem >= 4-23
# for the RPM dependency generators
@@ -220,7 +222,9 @@ BuildRequires: pkgconfig(libattica) >= %{attica_ver}
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libstreams) >= %{strigi_ver}
-BuildRequires: pkgconfig(libudev)
+%if 0%{?udev}
+BuildRequires: pkgconfig(libudev) >= 167
+%endif
BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(openssl)
@@ -467,7 +471,7 @@ done
%endif
%if 0%{?hal:1}
-install -p -m644 -D %{SOURCE10} /etc/kde/env/SOLID_HAL_LEGACY.sh
+install -p -m644 -D %{SOURCE10} %{buildroot}/etc/kde/env/SOLID_HAL_LEGACY.sh
%endif
More information about the scm-commits
mailing list