diff --git a/lxqt-session.changes b/lxqt-session.changes index fe7001b..423ed3c 100644 --- a/lxqt-session.changes +++ b/lxqt-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 26 00:44:05 UTC 2015 - sfalken@opensuse.org + +- Added conditionals to enable Fedora builds + ------------------------------------------------------------------- Sat Oct 25 12:05:44 UTC 2014 - andrea@opensuse.org diff --git a/lxqt-session.spec b/lxqt-session.spec index 8a746e1..dea5b17 100644 --- a/lxqt-session.spec +++ b/lxqt-session.spec @@ -1,7 +1,7 @@ # # spec file for package lxqt-session # -# 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 @@ -27,10 +27,11 @@ Source: %{name}-%{version}.tar.xz BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0 BuildRequires: pkgconfig(Qt5Xdg) +BuildRequires: pkgconfig(lxqt-qt5) >= 0.8.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(Qt5UiTools) Requires(pre): desktop-file-utils Requires(post): desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,11 +46,19 @@ use when a user logs out and to restart them the next time the user logs in. %setup -q %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}/lxqt-qt5 %post @@ -66,4 +75,5 @@ use when a user logs out and to restart them the next time the user logs in. %{_libdir}/lxqt-xdg-tools %{_datadir}/applications/*.desktop %{_datadir}/lxqt-qt5 + %changelog