minor tweaks for el6 (hal!), bump up cmake dep

This commit is contained in:
Rex Dieter 2013-03-21 10:52:26 -05:00
parent 08a0441be2
commit e5747843d1
1 changed files with 18 additions and 4 deletions

View File

@ -14,6 +14,13 @@
%else
%define udisks udisks
%endif
%if 0%{?rhel} == 6
%define hal 1
%define cmake cmake28
%else
%define cmake cmake
%define upower 1
%endif
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
@ -23,7 +30,7 @@
Summary: KDE Libraries
Version: 4.10.1
Release: 3%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -174,7 +181,7 @@ Requires(postun): /sbin/ldconfig
BuildRequires: automoc4 >= 0.9.88
BuildRequires: bison flex
BuildRequires: bzip2-devel
BuildRequires: cmake >= 2.6.4
BuildRequires: %{cmake} >= 2.8.9
BuildRequires: cups-devel cups
BuildRequires: gettext-devel
BuildRequires: giflib-devel
@ -212,7 +219,12 @@ BuildRequires: pkgconfig(zlib)
%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xproto) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
%{?x_deps:BuildRequires: %{x_deps}}
Requires: %{?udisks} upower
%{?udisks:Requires: %{udisks}}
%{?upower:Requires: upower}
%if 0%{?hal:1}
BuildRequires: hal-devel
Requires: hal
%endif
%if 0%{?apidocs}
BuildRequires: docbook-dtds
@ -247,7 +259,7 @@ Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release}
Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}
Requires: automoc4 >= 0.9.88
Requires: cmake >= 2.6.4
Requires: %{cmake} >= 2.8.9
Requires: pkgconfig(libattica) >= %{attica_ver}
Requires: pkgconfig(openssl)
Requires: pkgconfig(phonon)
@ -563,6 +575,8 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Thu Mar 21 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.1-3
- lower strigi min version
- BR: cmake >= 2.8.9
- minor tweaks for el6 (hal!)
* Sun Mar 10 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.1-2
- rebuild (OpenEXR)