public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Steve Cossette <farchord@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/dbusmenu-qt] rawhide: More fixes, and cleanup
Date: Tue, 21 Jul 2026 19:29:22 GMT [thread overview]
Message-ID: <178466216220.1.9610386906944345003.rpms-dbusmenu-qt-9e611324453c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/dbusmenu-qt
Branch : rawhide
Commit : 9e611324453c395da50f523f4c8f3378041fab9d
Author : Steve Cossette <farchord@gmail.com>
Date : 2026-07-21T15:29:15-04:00
Stats : +9/-11 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/dbusmenu-qt/c/9e611324453c395da50f523f4c8f3378041fab9d?branch=rawhide
Log:
More fixes, and cleanup
---
diff --git a/dbusmenu-qt.spec b/dbusmenu-qt.spec
index d90145a..5716088 100644
--- a/dbusmenu-qt.spec
+++ b/dbusmenu-qt.spec
@@ -11,9 +11,6 @@
# set this until when/if we port to new cmake macros
%global __cmake_in_source_build 1
-# https://fedoraproject.org/wiki/Changes/CMake_ninja_default
-%global _cmake_generator "Unix Makefiles"
-
Summary: A Qt implementation of the DBusMenu protocol
Name: dbusmenu-qt
Version: 0.9.3
@@ -22,7 +19,6 @@ Release: 0.41.%{snapshot}%{?dist}
License: LGPL-2.0-or-later
URL: https://launchpad.net/libdbusmenu-qt/
%if 0%{?snapshot}
-# bzr branch lp:libdbusmenu-qt && cd libdbusmenu-qt && bzr export --root=libdbusmenu-qt-%{version}-%{snapshot}bzr.tar.gz
Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libdbusmenu-qt/%{version}+%{ubuntu}.%{snapshot}-0ubuntu1/libdbusmenu-qt_%{version}+%{ubuntu}.%{snapshot}.orig.tar.gz
%else
Source0: https://launchpad.net/libdbusmenu-qt/trunk/%{version}/+download/libdbusmenu-qt-%{version}.tar.bz2
@@ -100,10 +96,8 @@ pushd %{_target_platform}
-DUSE_QT4:BOOL=ON \
-DUSE_QT5:BOOL=OFF \
-DWITH_DOC:BOOL=ON
-
+%cmake_build
popd
-
-%make_build -C %{_target_platform}
%endif # with_qt4
mkdir %{_target_platform}-qt5
@@ -112,17 +106,21 @@ pushd %{_target_platform}-qt5
-DUSE_QT4:BOOL=OFF \
-DUSE_QT5:BOOL=ON \
-DWITH_DOC:BOOL=OFF
-
+%cmake_build
popd
-%make_build -C %{_target_platform}-qt5
%install
%if 0%{?with_qt4}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+pushd %{_target_platform}
+%cmake_install
+popd
%endif # with_qt4
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5
+
+pushd %{_target_platform}-qt5
+%cmake_install
+popd
# unpackaged files
rm -rfv %{buildroot}%{_docdir}/libdbusmenu-qt*-doc
reply other threads:[~2026-07-21 19:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178466216220.1.9610386906944345003.rpms-dbusmenu-qt-9e611324453c@fedoraproject.org \
--to=farchord@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox