diff --git a/.gitignore b/.gitignore index 4bd796c..38ba3e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /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 diff --git a/ampache_browser.spec b/ampache_browser.spec index 6f485cf..7e89bda 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -1,17 +1,19 @@ +# Force out of source build +%undefine __cmake_in_source_build + Name: ampache_browser # Lib and several dirs use this derived name. A change of this name # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.2 -Release: 6%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: C++ and Qt based client library for Ampache access 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 %if 0%{?rhel} && 0%{?rhel} < 8 @@ -19,7 +21,7 @@ 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,12 +46,13 @@ developing applications that use %{name}. %global __cmake %{_bindir}/cmake3 %endif -%cmake . -%make_build +%cmake -D USE_QT6=OFF . +%cmake_build %install -%make_install +%cmake_install + find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -69,6 +72,36 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 + * Tue Jun 23 2020 Robert Scheck - 1.0.2-6 - Added build-time conditionals for RHEL/CentOS 7 (#1846719) - Corrected build requirement from qt5-devel to qt5-qtbase-devel diff --git a/include.patch b/include.patch deleted file mode 100644 index 8c9181c..0000000 --- a/include.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 d63c212..28482ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.2.tar.gz) = c96008ffa3abc87c9ca8a534e1eb8e8b6aea85c404421f8bd635f1755774673e6f0c956e36e1be642c5f0e1443547c59c2ae9283fb75b0dcefa4c5f9d23e438b +SHA512 (ampache_browser-1.0.6.tar.gz) = 08e1f5a7fe525819a8b55e66f43fde0cfdff5273103b167400c47b9d67dcf4b818466de8b0c9684dac4c9102aee53e50a202a3e3f9775c7e7471a4d133b6ae24