public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/amarok] epel10.2: use %ldconfig_scriptlets, %_kf5_metainfodir, BR: gcc-c++
Date: Mon, 06 Jul 2026 18:32:15 GMT [thread overview]
Message-ID: <178336273584.1.16867975425343262349.rpms-amarok-4620fc6d7698@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/amarok
Branch : epel10.2
Commit : 4620fc6d76982474785c3c1fc122e5a7aed8ce01
Author : Rex Dieter <rdieter@gmail.com>
Date : 2018-02-28T14:24:06-06:00
Stats : +12/-8 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/4620fc6d76982474785c3c1fc122e5a7aed8ce01?branch=epel10.2
Log:
use %ldconfig_scriptlets, %_kf5_metainfodir, BR: gcc-c++
---
diff --git a/amarok.spec b/amarok.spec
index cdb29e1..47267ad 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,7 +8,7 @@
Name: amarok
Summary: Media player
Version: 2.8.90
-Release: 18%{?dist}
+Release: 19%{?dist}
# KDE e.V. may determine that future GPL versions are accepted
License: GPLv2 or GPLv3
@@ -61,6 +61,7 @@ Patch43: 0043-Fix-appdata-add-the-required-summary-tag.patch
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
+BuildRequires: gcc-c++
## non-modular MusicBrainz-based audio fingerprint tag lookup support :(
#BuildRequires: ffmpeg-devel libofa-devel
BuildRequires: gettext
@@ -136,7 +137,6 @@ Amarok is a multimedia player with:
%package libs
Summary: Runtime libraries for %{name}
Requires: %{name} = %{version}-%{release}
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description libs
%{summary}.
@@ -219,9 +219,11 @@ make %{?_smp_mflags} -C %{_target_platform}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# appdata/metainfo
-mkdir -p %{buildroot}%{_kde4_datadir}/appdata/
+%if "%{_kde4_datadir}/metainfo" != "%{kf5_metainfodir}"
+mkdir -p %{buildroot}%{_kf5_metainfodir}
mv %{buildroot}%{_kde4_datadir}/metainfo/*.xml \
- %{buildroot}%{_kde4_datadir}/appdata/
+ %{buildroot}%{_kf5_metainfodir}
+%endif
# NoDisplay Amazon Downloader in menus
desktop-file-edit \
@@ -251,7 +253,7 @@ rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,pla
%check
%if 0%{?fedora} > 20
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/*%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
%endif
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*amarok.desktop
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/*amarok_containers.desktop
@@ -277,7 +279,7 @@ grep '^NoDisplay' %{buildroot}%{_kde4_datadir}/applications/kde4/amzdownloader.d
%{_kde4_configdir}/amarok.knsrc
%{_kde4_configdir}/amarok_homerc
%{_kde4_configdir}/amarokapplets.knsrc
-%{_kde4_datadir}/appdata/*%{name}.appdata.xml
+%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
%{_kde4_datadir}/applications/kde4/*amarok.desktop
%{_kde4_datadir}/applications/kde4/*amarok_containers.desktop
%{_kde4_datadir}/applications/kde4/amzdownloader.desktop
@@ -332,8 +334,7 @@ grep '^NoDisplay' %{buildroot}%{_kde4_datadir}/applications/kde4/amzdownloader.d
%{_datadir}/dbus-1/interfaces/*.xml
%{_datadir}/mime/packages/amzdownloader.xml
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files libs
%{_kde4_libdir}/libamarokcore.so.1*
@@ -362,6 +363,9 @@ grep '^NoDisplay' %{buildroot}%{_kde4_datadir}/applications/kde4/amzdownloader.d
%changelog
+* Wed Feb 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.8.90-19
+- use %%ldconfig_scriptlets, %%_kf5_metainfodir, BR: gcc-c++
+
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.90-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
reply other threads:[~2026-07-06 18:32 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=178336273584.1.16867975425343262349.rpms-amarok-4620fc6d7698@fedoraproject.org \
--to=rdieter@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