From beb38abe4e2d436fb5c5e17b7c6b38f34209d5f8 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:11 -0300 Subject: RPM amarok: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM amarok: update packaging for TDE master Consolidate the final validated packaging changes for amarok from the Tumbleweed build series. Original commits represented: 5. Signed-off-by: Sebastião Guerra --- redhat/applications/multimedia/amarok/amarok.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec index fc21004b8..3ff01cb9d 100644 --- a/redhat/applications/multimedia/amarok/amarok.spec +++ b/redhat/applications/multimedia/amarok/amarok.spec @@ -62,8 +62,6 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-konqueror-devel >= %{tde_version} -BuildRequires: trinity-filesystem >= %{tde_version} -Requires: trinity-filesystem >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tde-cmake >= %{tde_version} @@ -98,11 +96,9 @@ BuildRequires: alsa-lib-devel # ESOUND support #BuildRequires: esound-devel -# PCRE support -BuildRequires: pcre-devel - # LIBTOOL BuildRequires: libtool +BuildRequires: libnjb-devel %if 0%{?fedora} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel %endif @@ -119,6 +115,8 @@ BuildRequires: taglib-devel # SDL support %if 0%{?mdkver} BuildRequires: %{_lib}SDL-devel +%elif 0%{?suse_version} +BuildRequires: sdl12_compat-devel %else BuildRequires: SDL-devel %endif @@ -291,7 +289,7 @@ BuildRequires: trinity-akode-devel %endif # MP4V2 support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mdkver} < 24090000 %define with_mp4v2 1 BuildRequires: libmp4v2-devel @@ -513,11 +511,6 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then - %__mkdir_p build - cd build -fi - # Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ @@ -550,8 +543,7 @@ fi %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ -DWITH_SYSTEM_SQLITE=ON \ - -DBUILD_ALL=ON \ - .. + -DBUILD_ALL=ON %__make %{?_smp_mflags} || %__make -- cgit v1.2.3