--- cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec 2014/10/17 19:08:12 779827 +++ cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec 2014/10/17 19:10:42 779828 @@ -1,6 +1,8 @@ +%define qt5 1 + Name: lxqt-panel -Version: 0.7.0 -Release: %mkrel 5 +Version: 0.8.0 +Release: %mkrel 1 Source0: http://lxqt.org/downloads/lxqt/%{version}/%{name}-%{version}.tar.xz Patch0: lxqt-panel-0.7.0-mga-customize-default-panel.patch Summary: Panel for the LXQt desktop @@ -8,27 +10,40 @@ License: GPL Group: Graphical desktop/KDE BuildRequires: cmake +%if "%{qt5}" == "1" +BuildRequires: pkgconfig(lxqt-qt5) +BuildRequires: pkgconfig(lxqt-globalkeys-qt5) +BuildRequires: pkgconfig(lxqt-globalkeys-ui-qt5) +BuildRequires: pkgconfig(lxqtmount-qt5) +BuildRequires: pkgconfig(sysstat-qt5) +%else +BuildRequires: pkgconfig(lxqt) BuildRequires: pkgconfig(lxqt-globalkeys) BuildRequires: pkgconfig(lxqt-globalkeys-ui) BuildRequires: pkgconfig(lxqtmount) -BuildRequires: pkgconfig(lxqt) +BuildRequires: qt4-devel +BuildRequires: libsysstat-devel +%endif BuildRequires: pulseaudio-devel BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libstatgrab) BuildRequires: pkgconfig(libmenu-cache) BuildRequires: pkgconfig(xcomposite) BuildRequires: lm_sensors-devel -BuildRequires: libsysstat-devel -BuildRequires: qt4-devel + Obsoletes: razorqt-panel < 0.5.3-1 %description Panel for the LXQt desktop %prep -%setup -q -c %{name}-%{version} +%setup -q %{name}-%{version} %apply_patches +%if "%{qt5}" == "1" +%cmake -DUSE_QT5=ON +%else %cmake +%endif %build %make -C build