From d0ede08205d8ac0cb9c088a88eaab8431cf9cd29 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Mon, 10 Oct 2022 11:02:57 +0200 Subject: [PATCH] update to 3.6.0 Signed-off-by: Toshaan Bharvani --- ...cloud.desktopclient.nextcloud.metainfo.xml | 23 +++++++ SOURCES/gcc_12_fix.patch | 0 SOURCES/nextcloud.appdata.xml | 0 SOURCES/xcb_3.4.4.patch | 0 SOURCES/xcb_3.6.0.patch | 30 +++++++++ SPECS/nextcloud-client.spec | 65 ++++++++++++++++--- 6 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 SOURCES/com.nextcloud.desktopclient.nextcloud.metainfo.xml mode change 100644 => 100755 SOURCES/gcc_12_fix.patch mode change 100644 => 100755 SOURCES/nextcloud.appdata.xml mode change 100644 => 100755 SOURCES/xcb_3.4.4.patch create mode 100644 SOURCES/xcb_3.6.0.patch diff --git a/SOURCES/com.nextcloud.desktopclient.nextcloud.metainfo.xml b/SOURCES/com.nextcloud.desktopclient.nextcloud.metainfo.xml new file mode 100644 index 0000000..4264876 --- /dev/null +++ b/SOURCES/com.nextcloud.desktopclient.nextcloud.metainfo.xml @@ -0,0 +1,23 @@ + + + com.nextcloud.desktopclient.nextcloud + Nextcloud Desktop + GPL-2.0+ + Nextcloud desktop synchronization client + CC0-1.0 + +

The Nextcloud desktop client allows you to keep one or more folders full of +your photos, videos and documents synchronized with your server. Any file you +add, modify or delete in the synced folders on your desktop or laptop will show +up, change or disappear on the server and all other connected devices. Thanks +to the client, you can work with your files even when you are not online!

+ + + + The options dialog + https://nextcloud.com/wp-content/uploads/2022/04/linux.png + + + https://nextcloud.com + + diff --git a/SOURCES/gcc_12_fix.patch b/SOURCES/gcc_12_fix.patch old mode 100644 new mode 100755 diff --git a/SOURCES/nextcloud.appdata.xml b/SOURCES/nextcloud.appdata.xml old mode 100644 new mode 100755 diff --git a/SOURCES/xcb_3.4.4.patch b/SOURCES/xcb_3.4.4.patch old mode 100644 new mode 100755 diff --git a/SOURCES/xcb_3.6.0.patch b/SOURCES/xcb_3.6.0.patch new file mode 100644 index 0000000..ea34583 --- /dev/null +++ b/SOURCES/xcb_3.6.0.patch @@ -0,0 +1,30 @@ +--- desktop-3.6.0-orig/src/gui/main.cpp 2022-09-14 20:07:40.359852434 -0500 ++++ desktop-3.6.0/src/gui/main.cpp 2022-09-14 20:07:20.869331548 -0500 +@@ -56,8 +56,27 @@ + .arg(Theme::instance()->appNameGUI())); + } + ++#ifdef Q_OS_LINUX ++void wayland_hacks() ++{ ++ QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); ++ QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); ++ QByteArray sessionType = qgetenv("XDG_SESSION_TYPE").toLower(); ++ if (sessionType.contains("wayland") && (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"))) ++ { ++ qputenv("QT_QPA_PLATFORM", "xcb"); ++ } ++} ++#endif ++ ++ + int main(int argc, char **argv) + { ++ ++#ifdef Q_OS_LIUX ++ wayland_hacks(); ++#endif ++ + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-gpu --no-sandbox"); + QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); + diff --git a/SPECS/nextcloud-client.spec b/SPECS/nextcloud-client.spec index b3a4f2a..b5d34e2 100644 --- a/SPECS/nextcloud-client.spec +++ b/SPECS/nextcloud-client.spec @@ -1,7 +1,7 @@ ## START: Set by rpmautospec ## (rpmautospec version 0.2.6) %define autorelease(e:s:pb:) %{?-p:0.}%{lua: - release_number = 4; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist} @@ -13,7 +13,7 @@ %endif Name: nextcloud-client -Version: 3.4.4 +Version: 3.6.0 Release: %autorelease Summary: The Nextcloud Client @@ -21,11 +21,16 @@ Summary: The Nextcloud Client License: LGPLv2+ and GPLv2 Url: https://nextcloud.com/install/#install-clients Source0: https://github.com/nextcloud/desktop/archive/v%{version}/desktop-%{version}.tar.gz -Source1: nextcloud.appdata.xml +Source1: com.nextcloud.desktopclient.nextcloud.metainfo.xml # Patch0: fixes GNOME quirks on Wayland sessions. Read # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/ Patch0: xcb_%{version}.patch -Patch1: gcc_12_fix.patch + + +%if 0%{?rhel} +BuildRequires: rpmautospec-rpm-macros +BuildRequires: policycoreutils +%endif BuildRequires: check BuildRequires: chrpath @@ -109,6 +114,7 @@ Development headers for use of the nextcloud-client library %package nautilus Summary: nextcloud client nautilus extension +Supplements: (nextcloud-client and nautilus) Requires: nautilus Requires: nautilus-python Requires: %{name}%{?_isa} = %{version}-%{release} @@ -122,6 +128,7 @@ The nextcloud desktop client nautilus extension. # Only Fedora has Cinnamon, so there is no need for Nemo extension on EPEL %package nemo Summary: Nemo overlay icons +Supplements: (nextcloud-client and nemo) Requires: nemo Requires: nemo-python Requires: %{name}%{?_isa} = %{version}-%{release} @@ -133,6 +140,7 @@ in the nemo file manager. # Only Fedora has Mate, so there is no need for Caja extension on EPEL %package caja Summary: Caja overlay icons +Supplements: (nextcloud-client and caja) Requires: caja Requires: python3-caja Requires: %{name}%{?_isa} = %{version}-%{release} @@ -145,6 +153,7 @@ in the caja file manager. %if 0%{?fedora} || 0%{?rhel} > 7 %package dolphin Summary: Dolphin overlay icons +Supplements: (nextcloud-client and dolphin) Requires: dolphin Requires: %{name}%{?_isa} = %{version}-%{release} @@ -155,7 +164,6 @@ The nextcloud desktop client dolphin extension. %prep %setup -n desktop-%{version} %patch0 -p1 -%patch1 # change compiler flag @@ -173,8 +181,8 @@ sed -i 's/-fPIE/-fPIC/g' src/cmd/CMakeLists.txt %cmake_install %find_lang client --with-qt -mkdir -p %{buildroot}%{_datadir}/appdata/ -install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml +mkdir -p %{buildroot}%{_datadir}/metainfo/ +install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml # for distros that do not have KDE Plasma 5 @@ -193,9 +201,18 @@ rm -rf %{buildroot}%{_datadir}/nemo-python/ rm -rf %{buildroot}%{_datadir}/caja-python/ %endif +%post +%if 0%{?rhel} +setsebool -P selinuxuser_execmod=on +%endif + +%postun +%if 0%{?rhel} +setsebool -P selinuxuser_execmod=off +%endif %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml %ldconfig_scriptlets libs @@ -209,7 +226,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud. %{_datadir}/mime/packages/nextcloud.xml %{_datadir}/applications/com.nextcloud.desktopclient.nextcloud.desktop %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/appdata/nextcloud.appdata.xml +%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml %{_datadir}/cloud-providers/com.nextcloudgmbh.Nextcloud.ini %{_datadir}/dbus-1/services/com.nextcloudgmbh.Nextcloud.service @@ -249,6 +266,36 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud. %endif %changelog +* Mon Sep 19 2022 Mukundan Ragavan 3.6.0-2 +- update spec file to handle EL selinux reqs + +* Thu Sep 15 2022 Mukundan Ragavan 3.6.0-1 +- update to v3.6.0 + +* Fri Aug 05 2022 Mukundan Ragavan 3.5.4-1 +- update to v3.5.4 + +* Sun Jul 31 2022 Mukundan Ragavan 3.5.3-1 +- Update to v3.5.3 + +* Fri Jul 22 2022 Fedora Release Engineering 3.5.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 15 2022 AsciiWolf 3.5.2-3 +- Fix AppStream metadata + +* Thu Jul 14 2022 Jan Grulich 3.5.2-2 +- Rebuild (qt5) + +* Thu Jul 07 2022 Mukundan Ragavan 3.5.2-1 +- update to v3.5.2 + +* Tue Jun 28 2022 Maxwell G 3.5.1-2 +- Add boolean `Supplements` to file manager add-on subpackages. + +* Sat May 28 2022 Mukundan Ragavan 3.5.1-1 +- Update to v3.5.1; drop gcc-12 patch + * Tue May 17 2022 Jan Grulich 3.4.4-4 - Rebuild (qt5)