--- cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec 2015/02/22 14:34:27 816433 +++ cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec 2015/02/22 14:53:12 816434 @@ -1,38 +1,24 @@ -%define qt5 1 - %ifarch i586 %define _cmake_lib_suffix64 -DLIB_SUFFIX="" %endif Name: lxqt-panel -Version: 0.8.0 -Release: %mkrel 3 -Source0: http://lxqt.org/downloads/lxqt/%{version}/%{name}-%{version}.tar.xz -Patch0: lxqt-panel-0.7.0-mga-customize-default-panel.patch -# https://github.com/lxde/lxde-qt/issues/288 -Patch2: lxqt-panel-0.8-mga-undefined-references.patch +Version: 0.9.0 +Release: %mkrel 1 +Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz Summary: Panel for the LXQt desktop URL: http://lxqt.org/ License: LGPLv2+ Group: Graphical desktop/KDE BuildRequires: cmake -%if "%{qt5}" == "1" # https://github.com/lxde/lxqt-panel/issues/73 -Patch1: lxqt-panel-0.8-mga-lxqtmount-includes.patch -BuildRequires: pkgconfig(lxqt-qt5) -BuildRequires: pkgconfig(lxqt-globalkeys-qt5) -BuildRequires: pkgconfig(lxqt-globalkeys-ui-qt5) -BuildRequires: pkgconfig(lxqtmount-qt5) -BuildRequires: pkgconfig(sysstat-qt5) -BuildRequires: pkgconfig(Qt5Help) -%else +Patch1: lxqt-panel-0.9-mga-lxqtmount-includes.patch BuildRequires: pkgconfig(lxqt) BuildRequires: pkgconfig(lxqt-globalkeys) BuildRequires: pkgconfig(lxqt-globalkeys-ui) BuildRequires: pkgconfig(lxqtmount) -BuildRequires: qt4-devel -BuildRequires: libsysstat-devel -%endif +BuildRequires: pkgconfig(sysstat-qt5) +BuildRequires: pkgconfig(Qt5Help) BuildRequires: pulseaudio-devel BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libstatgrab) @@ -50,11 +36,8 @@ %prep %setup -q %{name}-%{version} %apply_patches -%if "%{qt5}" == "1" -%cmake -DUSE_QT5=ON -%else %cmake %_cmake_lib_suffix64 -%endif + %build %make -C build @@ -66,9 +49,7 @@ %{_sysconfdir}/lxqt/panel.conf %{_bindir}/%{name} %{_datadir}/lxqt/%{name} -%if "%{qt5}" == "1" -%{_datadir}/lxqt-qt5/translations/ -%endif +%{_datadir}/lxqt/translations/ %{_includedir}/lxqt %{_libdir}/%{name} %{_datadir}/lxqt/%{name}/clock.desktop @@ -79,7 +60,5 @@ %{_datadir}/lxqt/%{name}/mainmenu.desktop %{_datadir}/lxqt/%{name}/mount.desktop %{_datadir}/lxqt/%{name}/networkmonitor.desktop -%{_datadir}/lxqt/%{name}/panelkbindicator.desktop -%{_datadir}/lxqt/%{name}/panelsysstat.desktop -%{_datadir}/lxqt/%{name}/panelvolume.desktop +