diff --git a/.gitignore b/.gitignore index df3de6e..4bd796c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ /ampache_browser-1.0.0.tar.gz /ampache_browser-1.0.2.tar.gz -/ampache_browser-1.0.3.tar.gz -/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..6e15dc7 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,23 +7,22 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.8 -Release: 4%{?dist} +Version: 1.0.2 +Release: 7%{?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 +# Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}/%{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} && 0%{?rhel} < 8 +BuildRequires: cmake3 %endif - +BuildRequires: gcc-c++ +BuildRequires: qt5-qtbase-devel +Patch0: include.patch %description Ampache Browser is a library that implements desktop client access to the Ampache service (http://ampache.org). It provides end-user Qt UI and @@ -44,11 +43,11 @@ developing applications that use %{name}. %build -%if 0%{?rhel} == 8 -. /opt/rh/gcc-toolset-12/enable +%if 0%{?rhel} && 0%{?rhel} < 8 +%global __cmake %{_bindir}/cmake3 %endif -%cmake %{?el8:-D USE_QT6=OFF} . +%cmake %cmake_build @@ -74,63 +73,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. - -* Mon Jan 22 2024 Fedora Release Engineering - 1.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Dec 30 2023 Michael Schwendt - 1.0.7-1 -- Update to 1.0.7. - -* Sat Nov 4 2023 Michael Schwendt - 1.0.6-1 -- Update to 1.0.6 for Qt 6 support but build with USE_QT6=OFF. - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Dec 10 2022 Michael Schwendt - 1.0.4-1 -- Update to 1.0.4 (no build needed, just a potential compilation fix). - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Oct 6 2020 Michael Schwendt - 1.0.3-1 -- Update to 1.0.3 (only the GCC 10 fix). - * Mon Jul 27 2020 Fedora Release Engineering - 1.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/include.patch b/include.patch new file mode 100644 index 0000000..8c9181c --- /dev/null +++ b/include.patch @@ -0,0 +1,11 @@ +diff -Nrup a/include/internal/infrastructure/event/delegate.h b/include/internal/infrastructure/event/delegate.h +--- a/include/internal/infrastructure/event/delegate.h 2018-10-25 07:56:10.000000000 -0600 ++++ b/include/internal/infrastructure/event/delegate.h 2019-09-23 20:01:51.045172921 -0600 +@@ -13,6 +13,7 @@ + + + #include ++#include + + + diff --git a/sources b/sources index 43dd4c3..d63c212 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.8.tar.gz) = 81bceb8eac5581bb2c0af8ef40a5fcb7c52d4b0a00417fe1a4976893d8748ba84d2f865bbc523723cd85d46ccd28adabaf8129fd798896b8c20246828678308d +SHA512 (ampache_browser-1.0.2.tar.gz) = c96008ffa3abc87c9ca8a534e1eb8e8b6aea85c404421f8bd635f1755774673e6f0c956e36e1be642c5f0e1443547c59c2ae9283fb75b0dcefa4c5f9d23e438b