--- ../NX/SPECS/nextcloud-client.spec 2024-09-19 21:42:06.560716952 +0300 +++ SPECS/nextcloud-client.spec 2024-09-19 21:49:08.401148521 +0300 @@ -1,8 +1,8 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.6.5) +## (rpmautospec version 0.7.2) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; + release_number = 2; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -14,12 +14,13 @@ %endif Name: nextcloud-client -Version: 3.13.2 +Version: 3.13.4 Release: %autorelease Summary: The Nextcloud Client # -libs are LGPLv2+, rest GPLv2 -License: LGPLv2+ and GPLv2 +# Automatically converted from old format: LGPLv2+ and GPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ AND GPL-2.0-only Url: https://nextcloud.com/install/#install-clients Source0: https://github.com/nextcloud/desktop/archive/v%{version}/desktop-%{version}.tar.gz Source1: com.nextcloud.desktopclient.nextcloud.metainfo.xml @@ -64,7 +65,13 @@ BuildRequires: extra-cmake-modules BuildRequires: inkscape # Plasma 5 Dolphin integration -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 40 || 0%{?rhel} > 9 +BuildRequires: qt6-qtbase-devel +BuildRequires: kf6-kio-devel +BuildRequires: kf5-karchive-devel +BuildRequires: kf6-kcoreaddons-devel +BuildRequires: kf6-rpm-macros +%else BuildRequires: kf5-kio-devel BuildRequires: kf5-karchive-devel BuildRequires: kf5-kcoreaddons-devel @@ -93,7 +100,8 @@ %package libs Summary: Common files for nextcloud-client -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ Provides: mirall-common = %{version}-%{release} Obsoletes: mirall-common < 1.8.0 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -105,7 +113,8 @@ %package devel Summary: Development files for nextcloud-client -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} @@ -182,6 +191,13 @@ %install %cmake_install +%if 0%{?fedora} >= 40 || 0%{?rhel} > 9 +# move dolphin plugins to kf5_plugindir +mkdir -p %{buildroot}%{_kf6_plugindir} +mv -v %{buildroot}%{_qt5_plugindir}/kf6/kfileitemaction %{buildroot}/%{_kf6_plugindir} +mv -v %{buildroot}%{_qt5_plugindir}/kf6/overlayicon/ %{buildroot}/%{_kf6_plugindir} +%endif + %find_lang client --with-qt mkdir -p %{buildroot}%{_datadir}/metainfo/ install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml @@ -230,7 +246,6 @@ %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml %{_datadir}/dbus-1/services/com.nextcloudgmbh.Nextcloud.service -%{_datadir}/cloud-providers/com.nextcloudgmbh.Nextcloud.ini %files libs %{_libdir}/libnextcloudsync.so.0 @@ -259,404 +274,18 @@ %{_datadir}/caja-python/extensions/* %endif -%if 0%{?fedora} || 0%{?rhel} > 7 %files dolphin %{_libdir}/libnextclouddolphinpluginhelper.so +%if 0%{?fedora} >= 40 || 0%{?rhel} > 9 +%{_kf6_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so +%{_kf6_plugindir}/kfileitemaction/nextclouddolphinactionplugin.so +%else %{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so %{_kf5_plugindir}/kfileitemaction/nextclouddolphinactionplugin.so %endif %changelog -* Mon Sep 02 2024 Eduard Basov - 3.13.2-1 -- Rebuilt for MSVSphere 9.4 - ## START: Generated by rpmautospec -* Sat Jul 13 2024 Mukundan Ragavan - 3.13.2-1 -- Update to v3.13.2 - -* Fri Jul 05 2024 Mukundan Ragavan - 3.13.1-3 -- Add openssl-devel-engine as BR; close #rhbz 2295633 - -* Fri Jul 05 2024 Mukundan Ragavan - 3.13.1-2 -- Update to v3.13.1; close #rhbz 2295633 - -* Fri Jul 05 2024 Mukundan Ragavan - 3.13.1-1 -- Update to v3.13.1; close #rhbz 2295633 - -* Thu May 23 2024 Mukundan Ragavan - 3.13.0-1 -- Update to v3.13.0 - -* Thu May 09 2024 Mukundan Ragavan - 3.12.5-1 -- Update to v3.12.5 - -* Sat Mar 30 2024 Mukundan Ragavan - 3.12.3-1 -- Update to v3.12.3 - -* Sat Mar 09 2024 Mukundan Ragavan - 3.12.1-1 -- Update to v3.12.1 - -* Sat Jan 27 2024 Mukundan Ragavan - 3.11.1-1 -- Update to v3.11.1 - -* Thu Jan 25 2024 Fedora Release Engineering - 3.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Dec 14 2023 Mukundan Ragavan - 3.11.0-1 -- Update to v3.11.0 - -* Thu Nov 16 2023 Mukundan Ragavan - 3.10.1-1 -- Update to v3.10.1 - -* Tue Oct 17 2023 Mukundan Ragavan - 3.10.0-1 -- Update to v3.10.0 - -* Thu Aug 31 2023 Mukundan Ragavan - 3.9.3-1 -- Update to v3.9.3 - -* Sun Aug 13 2023 Mukundan Ragavan - 3.9.2-1 -- Update to v3.9.2 - -* Tue Aug 08 2023 Mukundan Ragavan - 3.9.1-2 -- drop i686 on F39+; inkscape (which is needed) dropped it on F39+ - -* Sun Aug 06 2023 Mukundan Ragavan - 3.9.1-1 -- Update to v3.9.1 - -* Thu Jul 20 2023 Fedora Release Engineering - 3.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Jun 18 2023 Mukundan Ragavan - 3.9.0-1 -- Update to v3.9.0 - -* Wed May 24 2023 Mukundan Ragavan - 3.8.2-1 -- Update to v3.8.2 - -* Fri Apr 21 2023 Mukundan Ragavan - 3.8.1-1 -- Update to v3.8.1 - -* Sun Apr 16 2023 Mukundan Ragavan - 3.8.0-1 -- Update to v3.8.0 - -* Sat Mar 11 2023 Mukundan Ragavan - 3.7.4-1 -- Update to v3.7.4 - -* Sun Feb 12 2023 Mukundan Ragavan - 3.7.3-1 -- Update to v3.7.3 - -* Fri Jan 27 2023 Justin Zobel - 3.6.6-2 -- Disable automatic update check - -* Sat Jan 21 2023 Mukundan Ragavan - 3.6.6-1 -- Update to v3.6.6 - -* Thu Jan 19 2023 Fedora Release Engineering - 3.6.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Dec 26 2022 Klaas Demter - 3.6.4-3 -- Fix main window and drop qt patch - -* Mon Dec 26 2022 Steven A. Falco - 3.6.4-2 -- Typo in xcb_3.6.4.patch - -* Sun Dec 25 2022 Mukundan Ragavan - 3.6.4-1 -- Update to v3.6.4 - -* Thu Nov 24 2022 Mukundan Ragavan - 3.6.2-1 -- update to v3.6.2 - -* Thu Oct 20 2022 Mukundan Ragavan - 3.6.1-1 -- update to v3.6.1 - -* Sun Oct 09 2022 Mukundan Ragavan - 3.6.0-3 -- Add upstream patch to support nautilus 43; fixes bz#2131796 - -* 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) - -* Thu Mar 31 2022 Mukundan Ragavan - 3.4.4-3 -- rebuild/qt5 - -* Thu Mar 24 2022 Mukundan Ragavan - 3.4.4-2 -- add patch file for v3.4.4 - -* Thu Mar 24 2022 Mukundan Ragavan - 3.4.4-1 -- Update to version 3.4.4 - -* Tue Mar 08 2022 Jan Grulich - 3.4.2-2 -- Rebuild (qt5) - -* Tue Feb 01 2022 Michel Alexandre Salim - 3.4.2-1 -- Update to 3.4.2 - -* Thu Jan 20 2022 Fedora Release Engineering - 3.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jan 15 2022 Michel Alexandre Salim - 3.4.1-1 -- Update to 3.4.1 - -* Sun Oct 31 2021 Mukundan Ragavan - 3.3.6-1 -- Update to 3.3.6 - -* Sat Oct 02 2021 Mukundan Ragavan - 3.3.5-1 -- Update to 3.3.5 - -* Tue Sep 21 2021 Mukundan Ragavan - 3.3.4-1 -- Update to 3.3.4 - -* Tue Sep 14 2021 Sahana Prasad - 3.3.3-2 -- Rebuilt with OpenSSL 3.0.0 - -* Sat Sep 04 2021 Mukundan Ragavan - 3.3.3-1 -- Update to 3.3.3 - -* Wed Sep 01 2021 Mukundan Ragavan - 3.3.2-1 -- Update to 3.3.2 - -* Fri Aug 13 2021 Mukundan Ragavan - 3.3.1-1 -- Update to 3.3.1 - -* Sat Jul 31 2021 Mukundan Ragavan - 3.3.0-1 -- Update to 3.3.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 3.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Michel Alexandre Salim - 3.2.4-2 -- Don't ship Nemo subpackage on EPEL -- Clean up to remove check for Fedora >= 24 -- Remove _hardened_build declaration, no longer needed since F23 - https://fedoraproject.org/wiki/Changes/Harden_All_Packages - -* Wed Jul 07 2021 Mukundan Ragavan - 3.2.4-1 -- Update to 3.2.4 - -* Thu Jun 24 2021 Mukundan Ragavan - 3.2.3-1 -- Update to 3.2.3 -- Add inkscape as buildrequires - -* Mon Jun 14 2021 Mukundan Ragavan - 3.2.2-2 -- Fix patch - -* Sat Jun 05 2021 Mukundan Ragavan - 3.2.2-1 -- Update to 3.2.2 - -* Mon May 03 2021 Mukundan Ragavan - 3.2.1-2 -- Replace picpie patch with sed (fixes FTBFS) - -* Sat May 01 2021 Germano Massullo - 3.2.1-1 -- 3.2.1 release - -* Sat May 01 2021 Germano Massullo - 3.2.0-2 -- added xcb.patch that fixes GNOME quirks on Wayland sessions. Read https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/ - -* Thu Apr 08 2021 Mukundan Ragavan - 3.2.0-1 -- Update to 3.2.0 - -* Thu Mar 11 2021 Mukundan Ragavan - 3.1.3-1 -- Update to 3.1.3 - -* Tue Jan 26 2021 Fedora Release Engineering - 3.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Dec 23 2020 Mukundan Ragavan - 3.1.1-1 -- Update to 3.1.1 - -* Tue Dec 22 2020 Mukundan Ragavan - 3.1.0-1 -- Update to 3.1.0 -- Add qtbase-private as buildrequires - -* Fri Oct 30 2020 Mukundan Ragavan - 3.0.3-1 -- Update to 3.0.3 - -* Fri Oct 02 2020 Jeff Law - 3.0.2-2 -- Use -fPIC rather than -fPIE. Re-enable LTO. - -* Sat Sep 26 2020 Mukundan Ragavan - 3.0.2-1 -- Update to 3.0.2 - -* Thu Sep 10 2020 Nick Bebout - 3.0.1-2 -- Disable LTO - -* Sat Sep 05 2020 Mukundan Ragavan - 3.0.1-1 -- Update to 3.0.1 -- Drop upstreamed patches - -* Mon Aug 31 2020 Michel Alexandre Salim - 2.6.5-9 -- Only require libgnome-keyring on Fedora (not EPEL). EPEL8 is getting qtkeychain 0.10.0 - -* Mon Aug 24 2020 Rex Dieter - 2.6.5-8 -- %%check: verify correct rpath/runpath - -* Mon Aug 24 2020 Rex Dieter - 2.6.5-7 -- restore use of %%cmake_kf5, explicitly undefine _cmake_skip_rpath (#1871655) - -* Tue Aug 04 2020 Mukundan Ragavan - 2.6.5-6 -- Change cmake macros to fix FTBFS - -* Sat Aug 01 2020 Fedora Release Engineering - 2.6.5-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2.6.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 15 2020 Gwyn Ciesla - 2.6.5-3 -- Require libgnome-keyring only for <=f32 - -* Tue Jul 14 2020 Gwyn Ciesla - 2.6.5-2 -- Reinstate libgnome-keyring requires. - -* Fri Jul 10 2020 Gwyn Ciesla - 2.6.5-1 -- 2.6.5 - -* Thu Jun 18 2020 Mukundan Ragavan - 2.6.4-5 -- Drop requires on libgnome-keyring (not needed with qtkeychain >= 0.10.0) - -* Mon Apr 27 2020 Germano Massullo - 2.6.4-4 -- Added Requires: libgnome-keyring Read https://bugzilla.redhat.com/show_bug.cgi?id=1652973 - -* Sun Apr 12 2020 Tim Klocke - 2.6.4-3 -- Fixed autostart when using libcloudproviders -- Fixed recently changed files in libcloudproviders support - -* Sun Apr 05 2020 Germano Massullo - 2.6.4-2 -- Added libcloudproviders support. Thanks to Tim Klocke -- Added BuildRequires: libcloudproviders-devel BuildRequires: pkgconfig(dbus-1) - -* Thu Mar 05 2020 Gwyn Ciesla - 2.6.4-1 -- 2.6.4 - -* Mon Feb 17 2020 Mukundan Ragavan - 2.6.3-1 -- Update to 2.6.3 - -* Wed Jan 29 2020 Fedora Release Engineering - 2.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 27 2019 Gwyn Ciesla - 2.6.2-1 -- 2.6.2 - -* Wed Nov 06 2019 Germano Massullo - 2.6.1-1 -- 2.6.1 release -- Replaced Requires:python-caja with Requires:python3-caja in caja subpackage - -* Fri Oct 04 2019 Germano Massullo - 2.6.0-1 -- 2.6.0 release - -* Sun Sep 08 2019 Germano Massullo - 2.6.0.rc1-0.1 -- 2.6.0 RC1 - -* Wed Aug 28 2019 Germano Massullo - 2.5.3-1 -- 2.5.3 release -- drop the icon patch because it has been fixed upstream. - -* Thu Jul 25 2019 Fedora Release Engineering - 2.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 10 2019 Germano Massullo - 2.5.2-2 -- added issue_1000.patch - -* Thu Apr 11 2019 Germano Massullo - 2.5.2-1 -- 2.5.2 release -- Changed python2-sphinx requirement to python3-sphinx - -* Fri Feb 01 2019 Fedora Release Engineering - 2.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 09 2019 Germano Massullo - 2.5.1-1 -- 2.5.1 release - -* Mon Nov 19 2018 Germano Massullo - 2.5.0-2 -- added ExcludeArch: ppc64, ppc64le, s390. Read https://bugzilla.redhat.com/show_bug.cgi?id=1651261 - -* Thu Nov 15 2018 Germano Massullo - 2.5.0-1 -- 2.5.0 release - -* Wed Aug 15 2018 Germano Massullo - 2.5.0-0.1 -- 2.5.0 beta 1 - -* Fri Jul 13 2018 Fedora Release Engineering - 2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Feb 13 2018 Germano Massullo - 2.4.0-1 -- 2.4.0 release -- Updated syslibs patch, thanks to Robert-André Mauchin -- Added comment to syslibs patch, thanks to Robert-André Mauchin -- updated nextcloud client theming to 2.3.3 - -* Thu Feb 08 2018 Fedora Release Engineering - 2.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 18 2017 Nick Bebout - 2.3.3-2 -- Change to BR python2-sphinx instead of python-sphinx - -* Mon Sep 11 2017 Nick Bebout - 2.3.3-1 -- update to 2.3.3 - -* Thu Aug 03 2017 Fedora Release Engineering - 2.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jun 04 2017 Germano Massullo - 2.3.2-2 -- added macros to build Caja subpackage only in Fedora, not EPEL (Mate is Fedora only) -- added macro to build Dolphin (Plasma 5) subpackage only in Fedora >= 24 && EPEL > 7 (EPEL7 ships KDE 4) - -* Sat Jun 03 2017 Germano Massullo - 2.3.2-1 -- Removed no longer necessary OpenSSL patch -- 2.3.2 release -- Remove caja extension hack. Included in upstream - -* Mon May 15 2017 Fedora Release Engineering - 2.2.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.2.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 11 2017 Kalev Lember - 2.2.4-8 -- Fix appdata file name to match with desktop file name -* Mon Jan 02 2017 Claudio Rodrigo Pereyra Diaz - 2.2.4-7 -- Add caja extension -* Mon Jan 02 2017 Timotheus Pokorra - 2.2.4-6 -- Fix the desktop icon (#1409252) -* Thu Dec 08 2016 Timotheus Pokorra - 2.2.4-5 -- Epel7: drop dolphin files since they are not included in build for Epel7 -* Wed Nov 23 2016 Nick Bebout - 2.2.4-4 -- Update for review -* Wed Nov 02 2016 Germano Massullo 2.2.4-3 -- First release - +* Mon Sep 16 2024 Mukundan Ragavan - 3.13.4-2 +- RPMAUTOSPEC: unresolvable merge ## END: Generated by rpmautospec