From 7a2acac86d2e311e2098cc1fd464e75f17f13925a08381362addeaa7c7d175fd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Feb 2015 01:17:07 +0000 Subject: [PATCH] Accepting request 287391 from X11:lxde 1 OBS-URL: https://build.opensuse.org/request/show/287391 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liblxqt?expand=0&rev=2 --- liblxqt.changes | 6 ++++++ liblxqt.spec | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/liblxqt.changes b/liblxqt.changes index 926bf4f..29223cd 100644 --- a/liblxqt.changes +++ b/liblxqt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 20 01:18:24 UTC 2015 - sfalken@opensuse.org + +- Changed to %cmake and %cmake_install macros in %build and + %install + ------------------------------------------------------------------- Mon Feb 9 15:46:51 UTC 2015 - sfalken@opensuse.org diff --git a/liblxqt.spec b/liblxqt.spec index adc2419..f06ed1a 100644 --- a/liblxqt.spec +++ b/liblxqt.spec @@ -34,8 +34,8 @@ BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 BuildRequires: pkgconfig(x11) -Obsoletes: liblxqt-qt5 < %{version} -Provides: liblxqt-qt5 = %{version} +Obsoletes: liblxqt-qt5 < %{version} +Provides: liblxqt-qt5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,18 +65,11 @@ lxqt libraries for development %setup -q -n liblxqt-%{version} %build -mkdir build -pushd build -cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - .. +%cmake %__make %{?_smp_flags} -popd %install -pushd build -make DESTDIR=$RPM_BUILD_ROOT install -popd +%cmake_install %fdupes -s %{buildroot}/%{_datadir}/lxqt/translations %fdupes -s %{buildroot}/%{_includedir}/lxqt