diff --git a/.gitignore b/.gitignore index df3de6e..a1835f5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ /ampache_browser-1.0.4.tar.gz /ampache_browser-1.0.6.tar.gz /ampache_browser-1.0.7.tar.gz -/ampache_browser-1.0.8.tar.gz diff --git a/ampache_browser.spec b/ampache_browser.spec index 84fdb14..39cf999 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,22 +7,24 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.8 +Version: 1.0.7 Release: 4%{?dist} Summary: C++ and Qt based client library for Ampache access -License: GPL-3.0-only +License: GPLv3 URL: http://ampache-browser.org Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: gcc-c++ -%if 0%{?fedora} || 0%{?rhel} >= 9 -BuildRequires: qt6-qtbase-devel -%else -BuildRequires: gcc-toolset-12 -BuildRequires: qt5-qtbase-devel +%if 0%{?rhel} == 7 +BuildRequires: cmake3 +BuildRequires: devtoolset-12-toolchain %endif +%if 0%{?rhel} == 8 +BuildRequires: gcc-toolset-12 +%endif +BuildRequires: gcc-c++ +BuildRequires: qt6-qtbase-devel %description Ampache Browser is a library that implements desktop client access to @@ -44,11 +46,18 @@ developing applications that use %{name}. %build +%if 0%{?rhel} == 7 +%global cmake %cmake3 +%global cmake_build %cmake3_build +%global cmake_install %cmake3_install + +. /opt/rh/devtoolset-12/enable +%endif %if 0%{?rhel} == 8 . /opt/rh/gcc-toolset-12/enable %endif -%cmake %{?el8:-D USE_QT6=OFF} . +%cmake . %cmake_build @@ -74,24 +83,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jan 1 2025 Michael Schwendt - 1.0.8-1 -- Update to 1.0.8. - -* Mon Jul 29 2024 Miroslav Suchý - 1.0.7-6 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 1.0.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Thu Jun 27 2024 Michael Schwendt - 1.0.7-4 - Build with Qt 6. diff --git a/sources b/sources index 43dd4c3..cc08bcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.8.tar.gz) = 81bceb8eac5581bb2c0af8ef40a5fcb7c52d4b0a00417fe1a4976893d8748ba84d2f865bbc523723cd85d46ccd28adabaf8129fd798896b8c20246828678308d +SHA512 (ampache_browser-1.0.7.tar.gz) = fc9b7492a14f36860f0f63ccf682760d0013dad91c0011dbd58370fd3fa83918add6e22702bf4dda6f8ee7b029fdaf9431bea33ecb6dcccf345d6fed80f863af