From cfe32e03c9134d32687a1819526a15bfe79c6aaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:11:56 +0000 Subject: [PATCH 01/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index d96a55a..db228b5 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -5,7 +5,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.0 -Release: 3.20180408%{?dist} +Release: 4.20180408%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -65,6 +65,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-4.20180408 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Apr 7 2018 Michael Schwendt - 1.0.0-3.20180408 - Merge fixes from v1.0 branch. - Replace ldconfig scriptlets with %%ldconfig_scriptlets macro. From 6c8aab319eb644bf5e43d16f33bbff3d13be2989 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sun, 30 Dec 2018 12:30:10 +0100 Subject: [PATCH 02/36] Update to 1.0.2. --- .gitignore | 1 + ampache_browser-1.0-branch-20180408.patch | 731 ---------------------- ampache_browser.spec | 10 +- sources | 2 +- 4 files changed, 7 insertions(+), 737 deletions(-) delete mode 100644 ampache_browser-1.0-branch-20180408.patch diff --git a/.gitignore b/.gitignore index 68ffc26..4bd796c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ampache_browser-1.0.0.tar.gz +/ampache_browser-1.0.2.tar.gz diff --git a/ampache_browser-1.0-branch-20180408.patch b/ampache_browser-1.0-branch-20180408.patch deleted file mode 100644 index 68014b2..0000000 --- a/ampache_browser-1.0-branch-20180408.patch +++ /dev/null @@ -1,731 +0,0 @@ -diff -Naur ampache_browser-1.0.0-orig/CMakeLists.txt ampache_browser-1.0-branch-20180408/CMakeLists.txt ---- ampache_browser-1.0.0-orig/CMakeLists.txt 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/CMakeLists.txt 2018-04-08 00:28:17.018973008 +0200 -@@ -3,12 +3,12 @@ - # Project: Ampache Browser - # License: GNU GPLv3 - # --# Copyright (C) 2015 - 2017 Róbert Čerňanský -+# Copyright (C) 2015 - 2018 Róbert Čerňanský - - - - cmake_minimum_required(VERSION 3.0) --project(ampache_browser VERSION 1.0.0) -+project(ampache_browser VERSION 1.0.1) - set(VERSION_EXTRA "") - set(soVersion 0) - -diff -Naur ampache_browser-1.0.0-orig/include/internal/data/providers/ampache.h ampache_browser-1.0-branch-20180408/include/internal/data/providers/ampache.h ---- ampache_browser-1.0.0-orig/include/internal/data/providers/ampache.h 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/include/internal/data/providers/ampache.h 2018-04-08 00:28:18.629937302 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -202,7 +202,7 @@ - /** - * @brief Request album arts from the server. - * -- * @note If this method is called before the the ::initialized event it immediately raises ::readyAlbumArts with -+ * @note If this method is called before ::initialized event it immediately raises ::readyAlbumArts with - * zero loaded arts. - * - * @param idsAndUrls Identifiers of the album art images that shall be requested paired with their URLs. IDs are -@@ -290,6 +290,7 @@ - std::vector> createArtists(QXmlStreamReader& xmlStreamReader) const; - void processTracks(QXmlStreamReader& xmlStreamReader, bool error); - std::vector> createTracks(QXmlStreamReader& xmlStreamReader) const; -+ void IfNoPendingClearFinishedAlbumArtsAndRaiseReady(); - std::string assembleUrlBase() const; - }; - -diff -Naur ampache_browser-1.0.0-orig/include/internal/data/repositories/repository.h ampache_browser-1.0-branch-20180408/include/internal/data/repositories/repository.h ---- ampache_browser-1.0.0-orig/include/internal/data/repositories/repository.h 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/include/internal/data/repositories/repository.h 2018-04-08 00:28:18.924930764 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -588,16 +588,27 @@ - offset++; - } - -- auto offsetAndLimit = std::pair{myLoadOffset, data.size()}; -- if (data.size() != static_cast(myLimit)) { -+ // if the server returns less entries than requested, we assume the missing ones are lost (theoretically they -+ // could be deleted sooner than we were able to load them); in that case we store the number of lost entries and -+ // inform that total number of entries has changed (SMELL: we still report the original total -+ // number of entries in maxCount() though); however if happens that the server returns more entries than requested, -+ // we assume that the server ignores 'limit' in the load request and work with returned entries as if they were -+ // requested -+ if (data.size() < static_cast(myLimit)) { - myNumberOfUnavailableEntries += myLimit - data.size(); - dataSizeChanged(); -+ } else if (data.size() > static_cast(myLimit)) { -+ infrastructure::LOG_WARN( -+ "Server does not respect 'limit' parameter. Performance during loading may be degraded."); - } - - myUnfilteredFilter->processUpdatedSourceData(myLoadOffset, data.size()); - if (isFiltered()) { - myFilter->processUpdatedSourceData(myLoadOffset, data.size()); - } -+ -+ auto offsetAndLimit = std::pair{myLoadOffset, data.size()}; -+ - myLoadOffset = -1; - myLoadProgress += data.size(); - infrastructure::LOG_DBG("Load progress: %d.", myLoadProgress); -diff -Naur ampache_browser-1.0.0-orig/include/internal/infrastructure/logging/logging.h ampache_browser-1.0-branch-20180408/include/internal/infrastructure/logging/logging.h ---- ampache_browser-1.0.0-orig/include/internal/infrastructure/logging/logging.h 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/include/internal/infrastructure/logging/logging.h 2018-04-08 00:28:19.611915537 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -19,7 +19,7 @@ - namespace infrastructure { - - /** -- * @brief Sets the maximal loggin level. -+ * @brief Sets the maximal logging level. - * - * If a log method with lower level than maxLogLevel is called, no message is logged. - * -diff -Naur ampache_browser-1.0.0-orig/NEWS ampache_browser-1.0-branch-20180408/NEWS ---- ampache_browser-1.0.0-orig/NEWS 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/NEWS 2018-04-08 00:28:17.165969750 +0200 -@@ -2,6 +2,25 @@ - ==================================== - - -+Version 1.0.1 [????-??-??] -+-------------------------- -+ -+* Fix issues when Nextcloud's Music app is used as Ampache server. -+ -+ Fix crash if server ignores 'limit' parameter and sends more data than it was requested. -+ -+ Fix crash when server returns empty album art URL for not available album arts. -+ -+ Fix crash when album art URL can not be parsed. -+ -+* Ensure the loading error status message is not overwritten. -+ -+ If error occures during loading an error message is shown in status line. Sometimes happened that this message -+ was later overwritten by "Loaded" message when loading finished. This is now fixed so that the error message always -+ stays displayed after loading has finished. -+ -+ -+ - Version 1.0.0 [2017-07-26] - -------------------------- - -diff -Naur ampache_browser-1.0.0-orig/src/application/data_loader.cc ampache_browser-1.0-branch-20180408/src/application/data_loader.cc ---- ampache_browser-1.0.0-orig/src/application/data_loader.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/data_loader.cc 2018-04-08 00:28:20.492896011 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -241,6 +241,10 @@ - - - void DataLoader::fireFinished(LoadingResult loadingResult) { -+ if (myState == Idle) { -+ return; -+ } -+ - LOG_INF("Data loader finished with result %d.", loadingResult); - myState = Idle; - finished(loadingResult); -diff -Naur ampache_browser-1.0.0-orig/src/application/models/album_model.cc ampache_browser-1.0-branch-20180408/src/application/models/album_model.cc ---- ampache_browser-1.0.0-orig/src/application/models/album_model.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/album_model.cc 2018-04-08 00:28:20.687891689 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -125,9 +125,9 @@ - - - --void AlbumModel::onLoaded(pair) { -- auto finishedRequestGroup = myAlbumRequests->setFinished(); -- dataChanged(createIndex(finishedRequestGroup.getLower(), 0), createIndex(finishedRequestGroup.getUpper(), 0)); -+void AlbumModel::onLoaded(pair offsetAndLimit) { -+ myAlbumRequests->setFinished(offsetAndLimit.first, offsetAndLimit.second); -+ dataChanged(createIndex(offsetAndLimit.first, 0), createIndex(offsetAndLimit.first + offsetAndLimit.second - 1, 0)); - } - - -@@ -143,13 +143,14 @@ - - - void AlbumModel::onArtsLoaded(pair offsetAndCount) { -- auto finishedRequestGroup = myArtRequests->setFinished(); -+ myArtRequests->setFinished(offsetAndCount.first, offsetAndCount.second); - if (myIsInUnfilteredArtsLoadMode) { - return; - } - - if (offsetAndCount.second != 0) { -- dataChanged(createIndex(finishedRequestGroup.getLower(), 0), createIndex(finishedRequestGroup.getUpper(), 0)); -+ dataChanged(createIndex(offsetAndCount.first, 0), -+ createIndex(offsetAndCount.first + offsetAndCount.second - 1, 0)); - } - - if (!myArtRequests->isInProgress()) { -diff -Naur ampache_browser-1.0.0-orig/src/application/models/artist_model.cc ampache_browser-1.0-branch-20180408/src/application/models/artist_model.cc ---- ampache_browser-1.0.0-orig/src/application/models/artist_model.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/artist_model.cc 2018-04-08 00:28:20.736890603 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -90,9 +90,9 @@ - - - --void ArtistModel::onLoaded(pair) { -- auto finishedRequestGroup = myRequests->setFinished(); -- dataChanged(createIndex(finishedRequestGroup.getLower(), 0), createIndex(finishedRequestGroup.getUpper(), 0)); -+void ArtistModel::onLoaded(pair offsetAndLimit) { -+ myRequests->setFinished(offsetAndLimit.first, offsetAndLimit.second); -+ dataChanged(createIndex(offsetAndLimit.first, 0), createIndex(offsetAndLimit.first + offsetAndLimit.second - 1, 0)); - } - - -diff -Naur ampache_browser-1.0.0-orig/src/application/models/request_groups.cc ampache_browser-1.0-branch-20180408/src/application/models/request_groups.cc ---- ampache_browser-1.0.0-orig/src/application/models/request_groups.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/request_groups.cc 2018-04-08 00:28:20.883887345 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -27,20 +27,15 @@ - - - --void RequestGroups::cutAndPlaceOnTop(RequestGroup requestGroup) { -- auto intersectingGroupIdxs = findIntersectingGroupIdxs(requestGroup); -- for (auto idx = intersectingGroupIdxs.size(); idx-- > 0;) { -- auto intersectingGroupIdx = intersectingGroupIdxs[idx]; -- auto intersectingGroup = myRequestGroups[intersectingGroupIdx]; -- pair remainderGroups = intersectingGroup.substract(requestGroup); -- myRequestGroups.erase(myRequestGroups.begin() + intersectingGroupIdx); -- if (!remainderGroups.second.isEmpty()) { -- myRequestGroups.insert(myRequestGroups.begin() + intersectingGroupIdx, remainderGroups.second); -- } -- if (!remainderGroups.first.isEmpty()) { -- myRequestGroups.insert(myRequestGroups.begin() + intersectingGroupIdx, remainderGroups.first); -- } -- } -+void RequestGroups::cut(RequestGroup requestGroup) { -+ cutRequestGroup(requestGroup); -+ chop(); -+} -+ -+ -+ -+void RequestGroups::moveOnTop(RequestGroup requestGroup) { -+ cutRequestGroup(requestGroup); - myRequestGroups.push_back(requestGroup); - chop(); - } -@@ -89,6 +84,25 @@ - } - - -+ -+void RequestGroups::cutRequestGroup(RequestGroup requestGroup) { -+ auto intersectingGroupIdxs = findIntersectingGroupIdxs(requestGroup); -+ for (auto idx = intersectingGroupIdxs.size(); idx-- > 0;) { -+ auto intersectingGroupIdx = intersectingGroupIdxs[idx]; -+ auto intersectingGroup = myRequestGroups[intersectingGroupIdx]; -+ pair remainderGroups = intersectingGroup.substract(requestGroup); -+ -+ myRequestGroups.erase(myRequestGroups.begin() + intersectingGroupIdx); -+ if (!remainderGroups.second.isEmpty()) { -+ myRequestGroups.insert(myRequestGroups.begin() + intersectingGroupIdx, remainderGroups.second); -+ } -+ if (!remainderGroups.first.isEmpty()) { -+ myRequestGroups.insert(myRequestGroups.begin() + intersectingGroupIdx, remainderGroups.first); -+ } -+ } -+} -+ -+ - - void RequestGroups::chop() { - if (myGranularity == 0) { -diff -Naur ampache_browser-1.0.0-orig/src/application/models/request_groups.h ampache_browser-1.0-branch-20180408/src/application/models/request_groups.h ---- ampache_browser-1.0.0-orig/src/application/models/request_groups.h 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/request_groups.h 2018-04-08 00:28:20.933886236 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -44,18 +44,30 @@ - */ - bool isEmpty() const; - -+ - /** -- * @brief Cuts @p requestGroup from the set and places it on top. -+ * @brief Cuts @p requestGroup from the set. - * -- * The operation modifies/removes affected groups as needed. For example of @p requestGroup is big, spreading -- * over (intersecting with) several groups in the set, those are removed and groups intersecting on bounds are -- * shrinked accordingly. -+ * The operation modifies/removes affected groups as needed. For example if @p requestGroup is big, spreading -+ * over (intersecting with) several groups in the set, inner intersecting groups are removed and groups -+ * intersecting on bounds are shrinked accordingly. - * -- * The entire set is then modified so that no group is bigger than the set granularity. -+ * @note The entire set is then modified so that no group is bigger than the set granularity. -+ * -+ * @param requestGroup Group that shall be cut. -+ */ -+ void cut(RequestGroup requestGroup); -+ -+ /** -+ * @brief Cuts @p requestGroup from the set and places it on top. -+ * -+ * @note The entire set is then modified so that no group is bigger than the set granularity. - * - * @param requestGroup The group that shall be cut and moved. -+ * -+ * @sa cut() - */ -- void cutAndPlaceOnTop(RequestGroup requestGroup); -+ void moveOnTop(RequestGroup requestGroup); - - /** - * @brief Make grup determined by @p offset bigger by one. -@@ -88,6 +100,7 @@ - // stored groups - std::vector myRequestGroups; - -+ void cutRequestGroup(RequestGroup requestGroup); - void chop(); - void appendOnTop(std::vector& groups, RequestGroup groupToPlace); - int findOwningGroupIdx(int offset) const; -diff -Naur ampache_browser-1.0.0-orig/src/application/models/requests.cc ampache_browser-1.0-branch-20180408/src/application/models/requests.cc ---- ampache_browser-1.0.0-orig/src/application/models/requests.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/requests.cc 2018-04-08 00:28:20.983885128 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -38,9 +38,9 @@ - } - - if (offset < myLastEnqueuedOffset) { -- myRequestGroups->cutAndPlaceOnTop(RequestGroup{offset, offset}); -+ myRequestGroups->moveOnTop(RequestGroup{offset, offset}); - } else if (offset > myLastEnqueuedOffset + 1) { -- myRequestGroups->cutAndPlaceOnTop(RequestGroup{offset, offset}); -+ myRequestGroups->moveOnTop(RequestGroup{offset, offset}); - } else { - myRequestGroups->extend(offset); - } -@@ -55,10 +55,15 @@ - - - --// SMELL: Not necesary to expose RequestGroup. Return just pair and Requests will be the only --// "interface" class to request handling. Same for readyToExecute event. --RequestGroup Requests::setFinished() { -- auto finishedRequestGroup = myCurrentRequestGroup; -+void Requests::setFinished(int offset, int count) { -+ auto finishedRequestGroup = RequestGroup{offset, offset + count - 1}; -+ -+ // finished requests may be different from what was ready to execution; if there were some requests finished which -+ // were not ready remainderGroups will contain them; they have to be cut from myRequestGroups -+ auto remainderGroups = finishedRequestGroup.substract(myCurrentRequestGroup); -+ myRequestGroups->cut(remainderGroups.first); -+ myRequestGroups->cut(remainderGroups.second); -+ - if (!myRequestGroups->isEmpty()) { - myCurrentRequestGroup = myRequestGroups->pop(); - readyToExecute(myCurrentRequestGroup); -@@ -66,7 +71,6 @@ - myCurrentRequestGroup = RequestGroup{}; - myLastEnqueuedOffset = numeric_limits::max(); - } -- return finishedRequestGroup; - } - - -diff -Naur ampache_browser-1.0.0-orig/src/application/models/requests.h ampache_browser-1.0-branch-20180408/src/application/models/requests.h ---- ampache_browser-1.0.0-orig/src/application/models/requests.h 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/requests.h 2018-04-08 00:28:21.031884065 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -56,6 +56,8 @@ - - Requests& operator=(const Requests& other) = delete; - -+ // SMELL: Not necesary to expose RequestGroup. Use just pair<> as parameter and Requests will be the only -+ // "interface" class to request handling. Same for readyToExecute event. - /** - * @brief A group of requests is ready to be executed. - * -@@ -82,11 +84,15 @@ - /** - * @brief Inform the instance that the operation started upon ::readyToExecute event has finished. - * -- * @return Group of requests for which the operation was previously ready to be executed. -+ * Ready to execute requests which are not reported as finished will be set as finished (will not be -+ * executed again). Finished requests which were not ready to execute will also be set as finished. -+ * -+ * @param offset The number of first finished request (may be different from what was originally requested). -+ * @param count The count of finished requests (may be different from what was originally requested). - * - * @sa ::readyToExecute - */ -- RequestGroup setFinished(); -+ void setFinished(int offset, int count); - - /** - * @brief Returns true if some operation is being executed. -diff -Naur ampache_browser-1.0.0-orig/src/application/models/track_model.cc ampache_browser-1.0-branch-20180408/src/application/models/track_model.cc ---- ampache_browser-1.0.0-orig/src/application/models/track_model.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/application/models/track_model.cc 2018-04-08 00:28:21.080882978 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -121,9 +121,9 @@ - - - --void TrackModel::onLoaded(pair) { -- auto finishedRequestGroup = myRequests->setFinished(); -- dataChanged(createIndex(finishedRequestGroup.getLower(), 0), createIndex(finishedRequestGroup.getUpper(), 0)); -+void TrackModel::onLoaded(pair offsetAndLimit) { -+ myRequests->setFinished(offsetAndLimit.first, offsetAndLimit.second); -+ dataChanged(createIndex(offsetAndLimit.first, 0), createIndex(offsetAndLimit.first + offsetAndLimit.second - 1, 0)); - } - - -diff -Naur ampache_browser-1.0.0-orig/src/data/indices.cc ampache_browser-1.0-branch-20180408/src/data/indices.cc ---- ampache_browser-1.0.0-orig/src/data/indices.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/data/indices.cc 2018-04-08 00:28:22.065861147 +0200 -@@ -19,8 +19,8 @@ - - void Indices::addArtists(const vector>& artists) { - for (auto& artist: artists) { -- myArtistAlbums[artist.get()] = move(AlbumDataUnorderedSet{}); -- myArtistTracks[artist.get()] = move(TrackDataUnorderedSet{}); -+ myArtistAlbums[artist.get()] = AlbumDataUnorderedSet{}; -+ myArtistTracks[artist.get()] = TrackDataUnorderedSet{}; - } - } - -@@ -28,7 +28,7 @@ - - void Indices::addAlbums(const vector>& albums) { - for (auto& album: albums) { -- myAlbumTracks[album.get()] = move(TrackDataUnorderedSet{}); -+ myAlbumTracks[album.get()] = TrackDataUnorderedSet{}; - } - } - -diff -Naur ampache_browser-1.0.0-orig/src/data/providers/ampache/ampache.cc ampache_browser-1.0-branch-20180408/src/data/providers/ampache/ampache.cc ---- ampache_browser-1.0.0-orig/src/data/providers/ampache/ampache.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/data/providers/ampache/ampache.cc 2018-04-08 00:28:22.212857889 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -125,11 +125,24 @@ - return; - } - -+ // SMELL: size specified on multiple places -+ QPixmap notAvailablePixmap{100, 100}; -+ notAvailablePixmap.fill(QColor(230, 225, 220)); -+ - LOG_DBG("Getting %d album arts.", idsAndUrls.size()); - for (auto& idAndUrl: idsAndUrls) { -- myPendingAlbumArts.insert(idAndUrl.first); -- myNetworkRequestFn(idAndUrl.second, myAlbumArtsNetworkRequestCb); -+ if (idAndUrl.second.empty()) { -+ // SMELL: If the server did not provide any Art URL then it would be better if client (frontend/model) -+ // created the replacement Art (with the "Not Available" image of its choice). Currently, Ampache (3.8.3) -+ // provides URLs for not available Arts as well; Nextcloud's Music app (0.5.6) sends empty URLs for -+ // not available Arts. -+ myFinishedAlbumArts.emplace(idAndUrl.first, notAvailablePixmap); -+ } else { -+ myPendingAlbumArts.insert(idAndUrl.first); -+ myNetworkRequestFn(idAndUrl.second, myAlbumArtsNetworkRequestCb); -+ } - } -+ IfNoPendingClearFinishedAlbumArtsAndRaiseReady(); - } - - -@@ -168,8 +181,20 @@ - void Ampache::onAlbumArtsNetworkRequestFinished(const string& artUrl, const char* content, int contentSize) { - LOG_DBG("Album art request has returned with network content of length %d.", contentSize); - -- auto scaleAlbumArtRunnable = new ScaleAlbumArtRunnable(AmpacheUrl{artUrl}.parseIdValue(), -- QByteArray{content, contentSize}); -+ // SMELL: Format of Album Art URL is not server's public API. Entire url should be the ID (mapped to album ID). -+ // Ampache (3.8.3) passes the album ID in parameter 'id'; Nextcloud's Music app (0.5.6) in parameter 'filter' -+ auto id = AmpacheUrl{artUrl}.parseIdValue(); -+ id = id.empty() ? AmpacheUrl{artUrl}.parseFilterValue() : id; -+ -+ // give up if we could not parse ID -+ if (id.empty()) { -+ myFinishedAlbumArts.clear(); // returning empty finished album arts list means error -+ myPendingAlbumArts.clear(); -+ IfNoPendingClearFinishedAlbumArtsAndRaiseReady(); -+ return; -+ } -+ -+ auto scaleAlbumArtRunnable = new ScaleAlbumArtRunnable(id, QByteArray{content, contentSize}); - scaleAlbumArtRunnable->setAutoDelete(false); - connect(scaleAlbumArtRunnable, SIGNAL(finished(ScaleAlbumArtRunnable*)), this, - SLOT(onScaleAlbumArtRunnableFinished(ScaleAlbumArtRunnable*))); -@@ -190,12 +215,7 @@ - myFinishedAlbumArts.emplace(albumId, art); - myPendingAlbumArts.erase(albumId); - -- if (myPendingAlbumArts.empty()) { -- auto finishedAlbumArts = myFinishedAlbumArts; -- myFinishedAlbumArts.clear(); -- -- readyAlbumArts(finishedAlbumArts); -- } -+ IfNoPendingClearFinishedAlbumArtsAndRaiseReady(); - } - - -@@ -387,16 +407,16 @@ - if (xmlElement == "album") { - QXmlStreamAttributes attributes = xmlStreamReader.attributes(); - if (attributes.hasAttribute("id")) { -- id = attributes.value("id").toString().toStdString(); -+ id = attributes.value("id").toString().trimmed().toStdString(); - } - } else if (xmlElement == "artist") { - QXmlStreamAttributes attributes = xmlStreamReader.attributes(); - if (attributes.hasAttribute("id")) { -- artistId = attributes.value("id").toString().toStdString(); -+ artistId = attributes.value("id").toString().trimmed().toStdString(); - } - } - else { -- auto value = xmlStreamReader.readElementText().toStdString(); -+ auto value = xmlStreamReader.readElementText().trimmed().toStdString(); - - if (xmlElement == "name") { - albumName = value; -@@ -419,6 +439,7 @@ - } catch (const invalid_argument& ex) {} - catch (const out_of_range& ex) {} - } else if (xmlElement == "art") { -+ // TODO: Sanitize URL. - artUrl = value; - } - } -@@ -478,11 +499,11 @@ - if (xmlElement == "artist") { - QXmlStreamAttributes attributes = xmlStreamReader.attributes(); - if (attributes.hasAttribute("id")) { -- id = attributes.value("id").toString().toStdString(); -+ id = attributes.value("id").toString().trimmed().toStdString(); - } - } - else { -- auto value = xmlStreamReader.readElementText().toStdString(); -+ auto value = xmlStreamReader.readElementText().trimmed().toStdString(); - - if (xmlElement == "name") { - artistName = value; -@@ -558,21 +579,21 @@ - if (xmlElement == "song") { - QXmlStreamAttributes attributes = xmlStreamReader.attributes(); - if (attributes.hasAttribute("id")) { -- id = attributes.value("id").toString().toStdString(); -+ id = attributes.value("id").toString().trimmed().toStdString(); - } - } else if (xmlElement == "artist") { - QXmlStreamAttributes attributes = xmlStreamReader.attributes(); - if (attributes.hasAttribute("id")) { -- artistId = attributes.value("id").toString().toStdString(); -+ artistId = attributes.value("id").toString().trimmed().toStdString(); - } - } else if (xmlElement == "album") { - QXmlStreamAttributes attributes = xmlStreamReader.attributes(); - if (attributes.hasAttribute("id")) { -- albumId = attributes.value("id").toString().toStdString(); -+ albumId = attributes.value("id").toString().trimmed().toStdString(); - } - } - else { -- auto value = xmlStreamReader.readElementText().toStdString(); -+ auto value = xmlStreamReader.readElementText().trimmed().toStdString(); - - if (xmlElement == "title") { - title = value; -@@ -583,6 +604,7 @@ - } catch (const invalid_argument& ex) {} - catch (const out_of_range& ex) {} - } else if (xmlElement == "url") { -+ // TODO: Sanitize URL. - url = value; - } - } -@@ -596,6 +618,17 @@ - } - - -+ -+void Ampache::IfNoPendingClearFinishedAlbumArtsAndRaiseReady() { -+ if (myPendingAlbumArts.empty()) { -+ auto finishedAlbumArts = myFinishedAlbumArts; -+ myFinishedAlbumArts.clear(); -+ -+ readyAlbumArts(finishedAlbumArts); -+ } -+} -+ -+ - - string Ampache::assembleUrlBase() const { - return myConnectionInfo.getServerUrl() + "/server/xml.server.php?action="; -diff -Naur ampache_browser-1.0.0-orig/src/data/providers/ampache/ampache_url.cc ampache_browser-1.0-branch-20180408/src/data/providers/ampache/ampache_url.cc ---- ampache_browser-1.0.0-orig/src/data/providers/ampache/ampache_url.cc 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/data/providers/ampache/ampache_url.cc 2018-04-08 00:28:22.261856803 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -29,6 +29,12 @@ - - - -+string AmpacheUrl::parseFilterValue() const { -+ return parseValue(PARAM_FILTER); -+} -+ -+ -+ - string AmpacheUrl::parseActionValue() const { - return parseValue(PARAM_ACTION); - } -@@ -92,6 +98,7 @@ - const string AmpacheUrl::PARAM_SSID = "ssid"; - const string AmpacheUrl::PARAM_AUTH = "auth"; - const string AmpacheUrl::PARAM_ID = "id"; -+const string AmpacheUrl::PARAM_FILTER = "filter"; - const string AmpacheUrl::PARAM_ACTION = "action"; - - } -diff -Naur ampache_browser-1.0.0-orig/src/data/providers/ampache/ampache_url.h ampache_browser-1.0-branch-20180408/src/data/providers/ampache/ampache_url.h ---- ampache_browser-1.0.0-orig/src/data/providers/ampache/ampache_url.h 2017-07-26 17:44:25.000000001 +0200 -+++ ampache_browser-1.0-branch-20180408/src/data/providers/ampache/ampache_url.h 2018-04-08 00:28:22.310855717 +0200 -@@ -3,7 +3,7 @@ - // Project: Ampache Browser - // License: GNU GPLv3 - // --// Copyright (C) 2015 - 2016 Róbert Čerňanský -+// Copyright (C) 2015 - 2018 Róbert Čerňanský - - - -@@ -39,6 +39,14 @@ - */ - std::string parseIdValue() const; - -+ -+ /** -+ * @brief Gets value of parameter 'filter'. -+ * -+ * @return std::string -+ */ -+ std::string parseFilterValue() const; -+ - /** - * @brief Gets value of parameter 'action'. - * -@@ -74,6 +82,7 @@ - static const std::string PARAM_SSID; - static const std::string PARAM_AUTH; - static const std::string PARAM_ID; -+ static const std::string PARAM_FILTER; - static const std::string PARAM_ACTION; - - // arguments from the constructor diff --git a/ampache_browser.spec b/ampache_browser.spec index db228b5..2531566 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -4,8 +4,8 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.0 -Release: 4.20180408%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -13,9 +13,6 @@ 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 -# https://github.com/ampache-browser/ampache_browser/tree/v1.0 -Patch0: ampache_browser-1.0-branch-20180408.patch - BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: qt5-devel @@ -65,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* Sun Dec 30 2018 Michael Schwendt - 1.0.2-1 +- Update to 1.0.2. + * Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-4.20180408 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 71202c5..d63c212 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.0.tar.gz) = 9757052a98134177f185fb8214f64c72f601d27c0b5fc924b5ff0fdaac849e188c03f81b4806e14f97c102b1b74791813272aceed97b3f8a5ecfadc374ea0269 +SHA512 (ampache_browser-1.0.2.tar.gz) = c96008ffa3abc87c9ca8a534e1eb8e8b6aea85c404421f8bd635f1755774673e6f0c956e36e1be642c5f0e1443547c59c2ae9283fb75b0dcefa4c5f9d23e438b From 7bce248c7e250c70951ac28d8de0eb91d98adb3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:16:20 +0000 Subject: [PATCH 03/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 2531566..2d6e63c 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -5,7 +5,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Dec 30 2018 Michael Schwendt - 1.0.2-1 - Update to 1.0.2. From 2783ac9aca50ec340fad17cd796aafaf013387a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:51:14 +0000 Subject: [PATCH 04/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 2d6e63c..040c1cd 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -5,7 +5,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From bfa0835500096429fab66956613a3370a59d2167 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 10:12:49 -0700 Subject: [PATCH 05/36] - Add missing #include for gcc-10 --- ampache_browser.spec | 7 +++++-- include.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 include.patch diff --git a/ampache_browser.spec b/ampache_browser.spec index 040c1cd..53ef4c8 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -5,7 +5,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -16,7 +16,7 @@ Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}. BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: qt5-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 @@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* Sat Dec 14 2019 Jeff Law - 1.0.2-4 +- Add missing #include for gcc-10 + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 + + + From 6ced6f717fd4f4843753eaee4c9fc9c6de082115 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:31:48 +0000 Subject: [PATCH 06/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 53ef4c8..68e1ec6 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -5,7 +5,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 14 2019 Jeff Law - 1.0.2-4 - Add missing #include for gcc-10 From fbc6e6b7ed2893bf87a1a0a70226465ee88483d4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 23 Jun 2020 23:11:36 +0200 Subject: [PATCH 07/36] - Added build-time conditionals for RHEL/CentOS 7 (#1846719) - Corrected build requirement from qt5-devel to qt5-qtbase-devel --- ampache_browser.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 68e1ec6..6f485cf 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -5,7 +5,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -14,8 +14,11 @@ Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}. # Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake +%if 0%{?rhel} && 0%{?rhel} < 8 +BuildRequires: cmake3 +%endif BuildRequires: gcc-c++ -BuildRequires: qt5-devel +BuildRequires: qt5-qtbase-devel Patch0: include.patch %description Ampache Browser is a library that implements desktop client access to @@ -37,6 +40,10 @@ developing applications that use %{name}. %build +%if 0%{?rhel} && 0%{?rhel} < 8 +%global __cmake %{_bindir}/cmake3 +%endif + %cmake . %make_build @@ -62,6 +69,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 + * Tue Jan 28 2020 Fedora Release Engineering - 1.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From bfaedd3ba3cdbb24a6aeccced80313b54d1a7c63 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 18 Jul 2020 14:41:09 -0400 Subject: [PATCH 08/36] Update to new out-of-source build mechanism --- ampache_browser.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 6f485cf..b2df75b 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -1,3 +1,6 @@ +# 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 @@ -44,12 +47,13 @@ developing applications that use %{name}. %global __cmake %{_bindir}/cmake3 %endif -%cmake . -%make_build +%cmake +%cmake_build %install -%make_install +%cmake_install + find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' From f5a66cde780f9f06d42f64de7dcff68d61e41c73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:00:35 +0000 Subject: [PATCH 09/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index b2df75b..6e15dc7 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -73,6 +73,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 9c3f0e2eb694d20c7e955b8d33c2f01f45f7ca53 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 6 Oct 2020 15:08:02 +0200 Subject: [PATCH 10/36] Update to 1.0.3 (only the GCC 10 fix). --- ampache_browser.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 6e15dc7..b27e8c4 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,14 +7,13 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.2 -Release: 7%{?dist} +Version: 1.0.3 +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 @@ -22,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 @@ -73,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 0aef11f850349803112d792f584631bc01e050cf Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 6 Oct 2020 15:08:58 +0200 Subject: [PATCH 11/36] Update to 1.0.3 (only the GCC 10 fix). --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4bd796c..f608927 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ampache_browser-1.0.0.tar.gz /ampache_browser-1.0.2.tar.gz +/ampache_browser-1.0.3.tar.gz diff --git a/sources b/sources index d63c212..d5a5f88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.2.tar.gz) = c96008ffa3abc87c9ca8a534e1eb8e8b6aea85c404421f8bd635f1755774673e6f0c956e36e1be642c5f0e1443547c59c2ae9283fb75b0dcefa4c5f9d23e438b +SHA512 (ampache_browser-1.0.3.tar.gz) = 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c From 7b44754861252a6a10b60eb4819ae878141b23ac Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 6 Oct 2020 15:09:11 +0200 Subject: [PATCH 12/36] Update to 1.0.3 (only the GCC 10 fix). --- include.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 include.patch 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 - - - From 649632d0ee8869c598f8e6c3f0d7602282fdf4ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:03:39 +0000 Subject: [PATCH 13/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index b27e8c4..b564f22 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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). From 8bf85ec7b342b5af3f62c78e9faeed1c3791c3bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:35:54 +0000 Subject: [PATCH 14/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b2f3514c43c4fd6df3dae84524bc6b655281ab3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:31:25 +0000 Subject: [PATCH 15/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index b564f22..4acf596 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From ba7e1d2da2897970392b9c9021d2b56944fa3354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:12:36 +0000 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 4acf596..9f7626c 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From ce57cd8aba41b0abdbadb91c62ec1ce59466c59a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:44:32 +0000 Subject: [PATCH 17/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 9f7626c..fa9537b 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 8109b16d8d52ef1937ea4591c9437e1b298d7754 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 10 Dec 2022 21:29:01 +0100 Subject: [PATCH 18/36] Update to 1.0.4 (no build needed, just a potential compilation fix). --- .gitignore | 1 + ampache_browser.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f608927..e9d1efe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/ampache_browser.spec b/ampache_browser.spec index fa9537b..f295aa8 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,8 +7,8 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.3 -Release: 5%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 diff --git a/sources b/sources index d5a5f88..b6c086b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.3.tar.gz) = 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c +SHA512 (ampache_browser-1.0.4.tar.gz) = 6b6240e0f4fcf1f16439505e3e0bb32f628ea903a02eeb89b575ac7acd7b57b06af25ee9454c5ffe869d5659852105eb0e415099ff84acc2f9dd3d825b5e62d7 From 3e6938b5d75043175f008d16b2a9428118923415 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:40:57 +0000 Subject: [PATCH 19/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index f295aa8..ae3f234 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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). From 4d20a5bd085c87be0ff012447003ad3721a2c194 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:13:04 +0000 Subject: [PATCH 20/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index ae3f234..0516093 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 7e5af09984685b8826eaef5b3bba0a1e12595077 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 4 Nov 2023 19:27:20 +0100 Subject: [PATCH 21/36] Update to 1.0.6 for Qt 6 support but build with USE_QT6=OFF. --- .gitignore | 1 + ampache_browser.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e9d1efe..38ba3e2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 0516093..7e89bda 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,8 +7,8 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.4 -Release: 3%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -46,7 +46,7 @@ developing applications that use %{name}. %global __cmake %{_bindir}/cmake3 %endif -%cmake +%cmake -D USE_QT6=OFF . %cmake_build @@ -72,6 +72,9 @@ 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 diff --git a/sources b/sources index b6c086b..28482ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.4.tar.gz) = 6b6240e0f4fcf1f16439505e3e0bb32f628ea903a02eeb89b575ac7acd7b57b06af25ee9454c5ffe869d5659852105eb0e415099ff84acc2f9dd3d825b5e62d7 +SHA512 (ampache_browser-1.0.6.tar.gz) = 08e1f5a7fe525819a8b55e66f43fde0cfdff5273103b167400c47b9d67dcf4b818466de8b0c9684dac4c9102aee53e50a202a3e3f9775c7e7471a4d133b6ae24 From 39ba9ebd2983fb07aebf4327f2b683077bc41091 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 4 Nov 2023 21:37:48 +0100 Subject: [PATCH 22/36] Fix building on RHEL/CentOS 7 --- ampache_browser.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 7e89bda..d48a3e4 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -43,7 +43,11 @@ developing applications that use %{name}. %build %if 0%{?rhel} && 0%{?rhel} < 8 -%global __cmake %{_bindir}/cmake3 +%global cmake %cmake3 +%global cmake_build %cmake3_build +%global cmake_install %cmake3_install +# Simplified https://github.com/ampache-browser/ampache_browser/pull/7 +sed -e 's/Qt::/Qt5::/g' -i CMakeLists.txt %endif %cmake -D USE_QT6=OFF . From 689477e505a865535dd3b99ae952c6f0d0d1aea2 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 30 Dec 2023 23:12:47 +0100 Subject: [PATCH 23/36] Update to 1.0.7. --- .gitignore | 1 + ampache_browser.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 38ba3e2..a1835f5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/ampache_browser.spec b/ampache_browser.spec index d48a3e4..eaa5601 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,7 +7,7 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: C++ and Qt based client library for Ampache access @@ -76,6 +76,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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. diff --git a/sources b/sources index 28482ad..cc08bcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.6.tar.gz) = 08e1f5a7fe525819a8b55e66f43fde0cfdff5273103b167400c47b9d67dcf4b818466de8b0c9684dac4c9102aee53e50a202a3e3f9775c7e7471a4d133b6ae24 +SHA512 (ampache_browser-1.0.7.tar.gz) = fc9b7492a14f36860f0f63ccf682760d0013dad91c0011dbd58370fd3fa83918add6e22702bf4dda6f8ee7b029fdaf9431bea33ecb6dcccf345d6fed80f863af From 3ad6f20635817aaf2e8737347747fa6ff77a634d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:51:07 +0000 Subject: [PATCH 24/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index eaa5601..18134b4 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -76,6 +76,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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. From 073d3f90da8589fe90761bdc7c545e308568287f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:59:37 +0000 Subject: [PATCH 25/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 18134b4..cee8df5 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -76,6 +76,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 31f2bba5e7c280dc0684122c9293fa60814b6b5a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 14 Apr 2024 14:20:00 +0200 Subject: [PATCH 26/36] Fix building on CentOS/RHEL 7 and 8 ampache_browser 1.0.7 requires C++17/filesystem headers and linking, however -lstdc++fs doesn't seem to work with GCC 8.x, while it works with GCC 12.x (RHEL >= 9). --- ampache_browser.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index cee8df5..9d4a345 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -16,8 +16,12 @@ URL: http://ampache-browser.org Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -%if 0%{?rhel} && 0%{?rhel} < 8 +%if 0%{?rhel} == 7 BuildRequires: cmake3 +BuildRequires: devtoolset-12-toolchain +%endif +%if 0%{?rhel} == 8 +BuildRequires: gcc-toolset-12 %endif BuildRequires: gcc-c++ BuildRequires: qt5-qtbase-devel @@ -42,12 +46,15 @@ developing applications that use %{name}. %build -%if 0%{?rhel} && 0%{?rhel} < 8 +%if 0%{?rhel} == 7 %global cmake %cmake3 %global cmake_build %cmake3_build %global cmake_install %cmake3_install -# Simplified https://github.com/ampache-browser/ampache_browser/pull/7 -sed -e 's/Qt::/Qt5::/g' -i CMakeLists.txt + +. /opt/rh/devtoolset-12/enable +%endif +%if 0%{?rhel} == 8 +. /opt/rh/gcc-toolset-12/enable %endif %cmake -D USE_QT6=OFF . From b10a994e6b24f374a5e357da16d10fc8748eb404 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 27 Jun 2024 23:24:19 +0200 Subject: [PATCH 27/36] Build with Qt 6. --- ampache_browser.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 9d4a345..39cf999 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -24,7 +24,7 @@ BuildRequires: devtoolset-12-toolchain BuildRequires: gcc-toolset-12 %endif BuildRequires: gcc-c++ -BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel %description Ampache Browser is a library that implements desktop client access to @@ -57,7 +57,7 @@ developing applications that use %{name}. . /opt/rh/gcc-toolset-12/enable %endif -%cmake -D USE_QT6=OFF . +%cmake . %cmake_build @@ -83,6 +83,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 061768224ee30e6386aaa5f77b8cab579592473e Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 1 Jul 2024 00:53:48 +0200 Subject: [PATCH 28/36] Remove support for building on CentOS/RHEL 7 --- ampache_browser.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 39cf999..1a85457 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -16,10 +16,6 @@ URL: http://ampache-browser.org Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -%if 0%{?rhel} == 7 -BuildRequires: cmake3 -BuildRequires: devtoolset-12-toolchain -%endif %if 0%{?rhel} == 8 BuildRequires: gcc-toolset-12 %endif @@ -46,13 +42,6 @@ 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 From a02d64f6d8ec62dcf7c67f5e134cc97b115bd25d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:56:21 +0000 Subject: [PATCH 29/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 1a85457..c457068 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPLv3 @@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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. From 8281c3a998ca6bd415ebb4ede1fe0531675f08be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 13:49:55 +0200 Subject: [PATCH 30/36] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ampache_browser.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index c457068..34d9436 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,10 +8,11 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ and Qt based client library for Ampache access -License: GPLv3 +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only URL: http://ampache-browser.org Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -72,6 +73,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 835904ce84a6314129a421547b99bb073713af28 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 10 Nov 2024 01:11:35 +0100 Subject: [PATCH 31/36] Build with Qt 5 on RHEL 8 --- ampache_browser.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 34d9436..be9dbb0 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -17,11 +17,13 @@ URL: http://ampache-browser.org Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -%if 0%{?rhel} == 8 -BuildRequires: gcc-toolset-12 -%endif BuildRequires: gcc-c++ +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: qt6-qtbase-devel +%else +BuildRequires: gcc-toolset-12 +BuildRequires: qt5-qtbase-devel +%endif %description Ampache Browser is a library that implements desktop client access to @@ -47,7 +49,7 @@ developing applications that use %{name}. . /opt/rh/gcc-toolset-12/enable %endif -%cmake . +%cmake %{?el8:-D USE_QT6=OFF} . %cmake_build From 7c42bc2fdc0a787135d564306483659bb3ae8ef0 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 10 Nov 2024 01:17:34 +0100 Subject: [PATCH 32/36] Reviewed automatically converted license tag --- ampache_browser.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index be9dbb0..053f6f7 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -11,7 +11,6 @@ Version: 1.0.7 Release: 6%{?dist} Summary: C++ and Qt based client library for Ampache access -# Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://ampache-browser.org Source0: https://github.com/ampache-browser/ampache_browser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz From 994404e5c7f3a1a84bf7685772f551487c2980ec Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 1 Jan 2025 13:50:27 +0100 Subject: [PATCH 33/36] Update to 1.0.8. --- .gitignore | 1 + ampache_browser.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1835f5..df3de6e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 053f6f7..eaba808 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -7,8 +7,8 @@ Name: ampache_browser # is likely to break API users due to not finding files any longer. %global vername %{name}_1 -Version: 1.0.7 -Release: 6%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPL-3.0-only @@ -74,6 +74,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 diff --git a/sources b/sources index cc08bcb..43dd4c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ampache_browser-1.0.7.tar.gz) = fc9b7492a14f36860f0f63ccf682760d0013dad91c0011dbd58370fd3fa83918add6e22702bf4dda6f8ee7b029fdaf9431bea33ecb6dcccf345d6fed80f863af +SHA512 (ampache_browser-1.0.8.tar.gz) = 81bceb8eac5581bb2c0af8ef40a5fcb7c52d4b0a00417fe1a4976893d8748ba84d2f865bbc523723cd85d46ccd28adabaf8129fd798896b8c20246828678308d From a250db6442b01242fa5f6406127875ada9025a71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:58:40 +0000 Subject: [PATCH 34/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index eaba808..7f6de43 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPL-3.0-only @@ -74,6 +74,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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. From 6140273e7c0f0728d940035b33a47dc7a810a4b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:57:15 +0000 Subject: [PATCH 35/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 7f6de43..1d27569 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPL-3.0-only @@ -74,6 +74,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/cmake/%{vername} %changelog +* 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 From 056f979b1254ac12cc62a2ac07344f9cfdfb9f44 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:38:45 +0000 Subject: [PATCH 36/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ampache_browser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ampache_browser.spec b/ampache_browser.spec index 1d27569..84fdb14 100644 --- a/ampache_browser.spec +++ b/ampache_browser.spec @@ -8,7 +8,7 @@ Name: ampache_browser %global vername %{name}_1 Version: 1.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ and Qt based client library for Ampache access License: GPL-3.0-only @@ -74,6 +74,9 @@ 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