From b717d77085de4c4a17e09cc07d9fc3f0d34440357cc19059c2b9ece94c58f51c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Feb 2015 01:17:32 +0000 Subject: [PATCH] Accepting request 287404 from X11:lxde - Updated %build and %install to use cmake macros (forwarded request 287063 from sfalken) OBS-URL: https://build.opensuse.org/request/show/287404 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-globalkeys?expand=0&rev=2 --- lxqt-globalkeys.changes | 5 +++++ lxqt-globalkeys.spec | 20 ++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/lxqt-globalkeys.changes b/lxqt-globalkeys.changes index 7cf9ecd..a6c306b 100644 --- a/lxqt-globalkeys.changes +++ b/lxqt-globalkeys.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 20 20:03:54 UTC 2015 - sfalken@opensuse.org + +- Updated %build and %install to use cmake macros + ------------------------------------------------------------------- Mon Feb 9 19:33:20 UTC 2015 - sfalken@opensuse.org diff --git a/lxqt-globalkeys.spec b/lxqt-globalkeys.spec index 54e29c2..be3738e 100644 --- a/lxqt-globalkeys.spec +++ b/lxqt-globalkeys.spec @@ -34,8 +34,8 @@ BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(lxqt) >= 0.9.0 Requires(pre): desktop-file-utils Requires(post): desktop-file-utils -Obsoletes: lxqt-globalkeys-qt5 < %{version} -Provides: lxqt-globalkeys-qt5 = %{version} +Obsoletes: lxqt-globalkeys-qt5 < %{version} +Provides: lxqt-globalkeys-qt5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,23 +79,11 @@ Translation files for lxqt-globalkeys %patch0 -p1 %build -mkdir build -pushd build -cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \ -%ifarch x86_64 aarch64 ppc64 ppc64le - -DLIB_SUFFIX=64 \ -%endif - .. +%cmake %__make %{?_smp_mflags} -popd %install -pushd build -make DESTDIR=$RPM_BUILD_ROOT install -popd +%cmake_install %fdupes -s %{buildroot} %post