diff --git a/lxqt-panel.changes b/lxqt-panel.changes index ed60fab..331c63d 100644 --- a/lxqt-panel.changes +++ b/lxqt-panel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 26 00:59:25 UTC 2015 - sfalken@opensuse.org + +- Added conditionals to enable Fedora Builds + ------------------------------------------------------------------- Wed Nov 19 12:49:32 UTC 2014 - andrea@opensuse.org diff --git a/lxqt-panel.spec b/lxqt-panel.spec index 312ac7f..2009a41 100644 --- a/lxqt-panel.spec +++ b/lxqt-panel.spec @@ -1,7 +1,7 @@ # # spec file for package lxqt-panel # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,25 +25,26 @@ Group: System/GUI/LXDE-Qt Url: http://www.lxde.org Source0: %{name}-%{version}.tar.xz Patch0: %{name}-%{version}_fix_lxqt-mount_headers.patch -Patch1: %{name}-%{version}_fix_undefined_reference.patch +Patch1: %{name}-%{version}_fix_undefined_reference.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libsensors4-devel +BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libmenu-cache) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libstatgrab) -BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0 BuildRequires: pkgconfig(lxqt-globalkeys-qt5) +BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0 BuildRequires: pkgconfig(lxqtmount-qt5) >= 0.8.0 -BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 BuildRequires: pkgconfig(sysstat-qt5) BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(Qt5UiTools) +Requires: lxmenu-data Requires: menu-cache -Requires: lxmenu-data BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,11 +64,19 @@ Lxqt panel development files and headers %patch1 -p1 %build -%cmake -DUSE_QT5=ON +mkdir build +pushd build +cmake \ + -DUSE_QT5=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + .. %__make %{?_smp_mflags} +popd %install -%cmake_install +pushd build +make DESTDIR=$RPM_BUILD_ROOT install +popd %fdupes -s %{buildroot}/%{_datadir} %post -p /sbin/ldconfig