--- cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec 2014/10/18 09:06:43 783747 +++ cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec 2014/10/18 09:53:14 783748 @@ -1,16 +1,24 @@ %define qt5 1 +%ifarch i586 +%define _cmake_lib_suffix64 -DLIB_SUFFIX="" +%endif + Name: lxqt-panel 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 +# https://github.com/lxde/lxde-qt/issues/288 +Patch2: lxqt-panel-0.8-mga-undefined-references.patch Summary: Panel for the LXQt desktop URL: http://lxqt.org/ License: GPL 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) @@ -40,9 +48,10 @@ %setup -q %{name}-%{version} %apply_patches %if "%{qt5}" == "1" +#%cmake -DUSE_QT5=ON %_cmake_lib_suffix64 %cmake -DUSE_QT5=ON %else -%cmake +%cmake %_cmake_lib_suffix64 %endif %build @@ -51,13 +60,13 @@ %install %makeinstall_std -C build -%find_lang %{name} - - -%files -f %{name}.lang +%files %{_sysconfdir}/lxqt/panel.conf %{_bindir}/%{name} %{_datadir}/lxqt/%{name} +%if "%{qt5}" == "1" +%{_datadir}/lxqt-qt5/translations/ +%endif %{_includedir}/lxqt %{_libdir}/%{name} %{_datadir}/lxqt/%{name}/clock.desktop