--- cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec	2015/03/08 16:29:47	818124
+++ cauldron/lxqt-panel/current/SPECS/lxqt-panel.spec	2015/03/08 18:07:36	818125
@@ -1,11 +1,9 @@
-%ifarch i586
-%define _cmake_lib_suffix64 -DLIB_SUFFIX=""
-%endif
-
 Name: lxqt-panel
 Version: 0.9.0
-Release: %mkrel 3
+Release: %mkrel 4
 Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz
+# (doktor5000) add a custom panel configuration as default
+Source1: panel.conf
 Summary: Panel for the LXQt desktop
 URL: http://lxqt.org/
 License: LGPLv2+
@@ -31,6 +29,8 @@
 BuildRequires: pkgconfig(xcb-util)
 
 Obsoletes: razorqt-panel < 0.5.3-1
+# (doktor5000) ensure that lxqt-applications.menu is present
+Requires: lxqt-common >= 0.9.1-3
 
 %description
 Panel for the LXQt desktop
@@ -38,8 +38,8 @@
 %prep
 %setup -q %{name}-%{version}
 %apply_patches
-%cmake %_cmake_lib_suffix64
 
+%cmake
 
 %build
 %make -C build
@@ -47,6 +47,12 @@
 %install
 %makeinstall_std -C build
 
+# fix the default menu file, we want to use new upstream lxqt menu definition (cloned from lxmenu-data)
+sed -i 's|menu_file=.*|menu_file=%{_sysconfdir}/xdg/menus/lxqt-applications.menu|g' %{buildroot}/%{_sysconfdir}/lxqt/panel.conf
+
+# (doktor5000) add a custom panel configuration as default
+cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/lxqt/panel.conf
+
 %files
 %{_sysconfdir}/lxqt/panel.conf
 %{_bindir}/%{name}