Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package owncloud-client for openSUSE:Factory
checked in at 2024-12-18 20:09:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old)
and /work/SRC/openSUSE:Factory/.owncloud-client.new.29675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "owncloud-client"
Wed Dec 18 20:09:19 2024 rev:46 rq:1231725 version:5.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes
2024-04-26 23:27:33.629583156 +0200
+++
/work/SRC/openSUSE:Factory/.owncloud-client.new.29675/owncloud-client.changes
2024-12-18 20:09:36.711950773 +0100
@@ -1,0 +2,14 @@
+Tue Dec 17 15:39:28 UTC 2024 - Christophe Marin <[email protected]>
+
+- Add patch:
+ * owncloud-qt68.patch
+
+-------------------------------------------------------------------
+Wed Oct 16 15:18:15 UTC 2024 - Klaas Freitag <[email protected]>
+
+- Update to upstream version 5.3.1
+- Drop package owncloud-icons from this build, it is coming in a
+ separate package called owncloud-extensions-resources which is
+ used by all shell extensions for ownCloud
+
+-------------------------------------------------------------------
Old:
----
ownCloud_os-5.2.1.obscpio
New:
----
ownCloud_os-5.3.1.obscpio
owncloud-qt68.patch
BETA DEBUG BEGIN:
New:- Add patch:
* owncloud-qt68.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ owncloud-client.spec ++++++
--- /var/tmp/diff_new_pack.07elY0/_old 2024-12-18 20:09:37.972003290 +0100
+++ /var/tmp/diff_new_pack.07elY0/_new 2024-12-18 20:09:37.972003290 +0100
@@ -24,7 +24,7 @@
%endif
Name: owncloud-client
-Version: 5.2.1
+Version: 5.3.1
Release: 0
Summary: The ownCloud synchronization client
License: GPL-2.0-only AND GPL-3.0-only
@@ -34,6 +34,8 @@
Source2: 69-sync-inotify.conf
Source3: README.source
Source4: ownCloud.conf
+# PATCH-FIX-UPSTREAM
+Patch0: owncloud-qt68.patch
BuildRequires: cmake >= 2.8.11
BuildRequires: extra-cmake-modules
@@ -60,7 +62,7 @@
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(zlib)
Requires: libowncloudsync0 = %{version}
-Requires: owncloud-icons = %{version}
+Requires: owncloud-extensions-resources
Requires: qt6-sql-sqlite
Suggests: %{name}-nautilus
Suggests: %{name}-nemo
@@ -117,15 +119,6 @@
implements the ownCloud sync algorithm that keeps a local directory
in sync with the content on your cloud.
-%package -n owncloud-icons
-Summary: Icons for the ownCloud client shell integrations
-Group: Productivity/Networking/Other
-BuildArch: noarch
-
-%description -n owncloud-icons
-Icons for the visual representation of the sync state in various file
-managers on the desktop.
-
%prep
%autosetup -p1 -n ownCloud_os-%{version}
@@ -144,14 +137,10 @@
# do not allow to call home
install -m 0644 -D %{SOURCE4} -t %{buildroot}%{_distconfdir}/ownCloud/
+# remove the icons that this version of the source tarball still contains
+rm %{buildroot}%{_datadir}/icons/hicolor/*/apps/ownCloud_*png
+
%suse_update_desktop_file -n owncloud
-# workaround for https://github.com/owncloud/ownbrander/issues/322
-for desktop_icon_dir in %{buildroot}%{_datadir}/icons/hicolor/*/apps; do
- # copy shortname to executable name, if missing.
- if [ -f $desktop_icon_dir/owncloud.png -a ! -f
$desktop_icon_dir/owncloud.png ]; then
- cp $desktop_icon_dir/owncloud.png $desktop_icon_dir/owncloud.png
- fi
-done
%ldconfig_scriptlets -n libowncloudsync0
@@ -171,13 +160,6 @@
# https://github.com/owncloud/client/issues/4107
%{_sysctldir}/69-sync-inotify.conf
-%files -n owncloud-icons
-%{_datadir}/icons/hicolor/*/apps/ownCloud_*.png
-%if 0%{?suse_version} < 1550
-%dir %{_datadir}/icons/hicolor/1024x1024
-%dir %{_datadir}/icons/hicolor/1024x1024/apps
-%endif
-
%files -n libowncloudsync0
%{_libdir}/libowncloudsync.so.*
%{_libdir}/libowncloud_csync.so.*
++++++ _service ++++++
--- /var/tmp/diff_new_pack.07elY0/_old 2024-12-18 20:09:38.020005291 +0100
+++ /var/tmp/diff_new_pack.07elY0/_new 2024-12-18 20:09:38.020005291 +0100
@@ -1,7 +1,7 @@
<services>
<service mode="manual" name="obs_scm">
<param name="filename">ownCloud_os</param>
- <param name="revision">v5.2.1</param>
+ <param name="revision">v5.3.1</param>
<param name="scm">git</param>
<param name="url">https://github.com/owncloud/client.git</param>
<param name="versionformat">@PARENT_TAG@</param>
++++++ ownCloud_os-5.2.1.obscpio -> ownCloud_os-5.3.1.obscpio ++++++
/work/SRC/openSUSE:Factory/owncloud-client/ownCloud_os-5.2.1.obscpio
/work/SRC/openSUSE:Factory/.owncloud-client.new.29675/ownCloud_os-5.3.1.obscpio
differ: char 48, line 1
++++++ ownCloud_os.obsinfo ++++++
--- /var/tmp/diff_new_pack.07elY0/_old 2024-12-18 20:09:38.076007625 +0100
+++ /var/tmp/diff_new_pack.07elY0/_new 2024-12-18 20:09:38.120009459 +0100
@@ -1,5 +1,5 @@
name: ownCloud_os
-version: 5.2.1
-mtime: 1704360845
-commit: 979bb990f214fbd1cccc5536c582d84e196d499f
+version: 5.3.1
+mtime: 1718104713
+commit: f15fd5635eb4b24e7e5a29a36a882628fb87a1e9
++++++ owncloud-qt68.patch ++++++
>From b2ff293ee10cb86c7c083e0ec10148e3f4b019f6 Mon Sep 17 00:00:00 2001
From: Hannah von Reth <[email protected]>
Date: Fri, 18 Oct 2024 12:40:53 +0200
Subject: [PATCH] fix: Qt6.8 build fix (#11943)
---
test/testcredentialmanager.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/testcredentialmanager.cpp b/test/testcredentialmanager.cpp
index 8881cb98388..90bead31e2a 100644
--- a/test/testcredentialmanager.cpp
+++ b/test/testcredentialmanager.cpp
@@ -112,8 +112,8 @@ private Q_SLOTS:
QTest::qWait(1000);
for (const auto s : spies) {
QCOMPARE(s->count(), 1);
- s->deleteLater();
}
+ qDeleteAll(spies);
spies.clear();
{
auto jobs = creds->clear(QStringLiteral("foo"));
@@ -131,8 +131,8 @@ private Q_SLOTS:
QTest::qWait(1000);
for (const auto s : spies) {
QCOMPARE(s->count(), 1);
- s->deleteLater();
}
+ qDeleteAll(spies);
}
}
};