diff --git a/.gitignore b/.gitignore index b242c4a..2104228 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /desktop-3.1.0.tar.gz /desktop-3.1.1.tar.gz /desktop-3.1.3.tar.gz +/desktop-3.2.0.tar.gz diff --git a/nextcloud-client-picpie.patch b/nextcloud-client-picpie.patch index 61de364..feebba7 100644 --- a/nextcloud-client-picpie.patch +++ b/nextcloud-client-picpie.patch @@ -1,9 +1,7 @@ -diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt -index abb3620..5702702 100644 ---- a/src/cmd/CMakeLists.txt -+++ b/src/cmd/CMakeLists.txt -@@ -10,8 +10,8 @@ set(cmd_SRC - +--- desktop-3.2.0-orig/src/gui/CMakeLists.txt 2021-04-08 18:54:35.506219040 -0400 ++++ desktop-3.2.0/src/gui/CMakeLists.txt 2021-04-08 18:44:45.982858065 -0400 +@@ -256,8 +256,8 @@ + ecm_add_app_icon(final_src ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}") if(UNIX AND NOT APPLE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") @@ -13,12 +11,10 @@ index abb3620..5702702 100644 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") endif() -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 2f1e99e..54a143c 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -250,8 +250,8 @@ endif() - ecm_add_app_icon(final_src ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}") +--- desktop-3.2.0-orig/src/cmd/CMakeLists.txt 2021-04-08 18:40:13.902337507 -0400 ++++ desktop-3.2.0/src/cmd/CMakeLists.txt 2021-04-08 18:41:51.291490488 -0400 +@@ -17,8 +17,8 @@ + target_include_directories(cmdCore PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer) if(UNIX AND NOT APPLE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") diff --git a/nextcloud-client.spec b/nextcloud-client.spec index bd4a07f..bb2a3cc 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -3,7 +3,7 @@ %global _hardened_build 1 Name: nextcloud-client -Version: 3.1.3 +Version: 3.2.0 Release: 1%{?dist} Summary: The Nextcloud Client @@ -21,7 +21,6 @@ Source1: nextcloud.appdata.xml # different from the bundled one. #Patch0: %%{name}-%%{version}-syslibs.patch Patch1: nextcloud-client-picpie.patch -Patch2: nextcloud-client_extern.patch BuildRequires: check BuildRequires: chrpath @@ -150,7 +149,6 @@ The nextcloud desktop client dolphin extension. %prep %setup -q -n desktop-%{version} %patch1 -p1 -%patch2 -p1 #rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication %build @@ -185,8 +183,6 @@ rm -rf %{buildroot}%{_datadir}/caja-python/ %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml -# verify rpath/runpath, see https://bugzilla.redhat.com/show_bug.cgi?id=1871655 -test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bindir}/nextcloud: RPATH=%{_libdir}/nextcloud" %ldconfig_scriptlets libs @@ -197,6 +193,7 @@ test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bind %files -f client.lang %{_bindir}/nextcloud %{_bindir}/nextcloudcmd +%{_datadir}/mime/packages/nextcloud.xml %{_datadir}/applications/com.nextcloud.desktopclient.nextcloud.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/appdata/nextcloud.appdata.xml @@ -206,7 +203,7 @@ test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bind %files libs %{_libdir}/libnextcloudsync.so.0 %{_libdir}/libnextcloudsync.so.%%{version} -%{_libdir}/nextcloud/libocsync.so.* +%{_libdir}/libnextcloud_csync.so* %doc README.md %config %{_sysconfdir}/Nextcloud/sync-exclude.lst %dir %{_sysconfdir}/Nextcloud @@ -214,7 +211,6 @@ test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bind %files devel %{_includedir}/nextcloudsync/ %{_libdir}/libnextcloudsync.so -%{_libdir}/nextcloud/libocsync.so %files nautilus %{_datadir}/nautilus-python/extensions/* @@ -237,6 +233,9 @@ test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bind %endif %changelog +* 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 diff --git a/nextcloud-client_extern.patch b/nextcloud-client_extern.patch deleted file mode 100644 index dec46ae..0000000 --- a/nextcloud-client_extern.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- desktop-3.1.3-orig/src/gui/cloudproviders/cloudproviderwrapper.cpp 2021-02-18 17:54:25.440043135 -0500 -+++ desktop-3.1.3/src/gui/cloudproviders/cloudproviderwrapper.cpp 2021-02-23 20:15:49.191543185 -0500 -@@ -13,13 +13,12 @@ - * for more details. - */ - --extern "C" { -- #include -- #include -- #include -- #include --} -+#include -+#include - -+ -+#include -+#include - #include "cloudproviderwrapper.h" - #include - #include ---- desktop-3.1.3-orig/src/gui/cloudproviders/cloudprovidermanager.cpp 2021-02-18 17:54:17.983836018 -0500 -+++ desktop-3.1.3/src/gui/cloudproviders/cloudprovidermanager.cpp 2021-02-23 20:19:09.085387436 -0500 -@@ -12,11 +12,10 @@ - * for more details. - */ - --extern "C" { -- #include -- #include -- #include --} -+#include -+#include -+#include -+ - #include "cloudproviderwrapper.h" - #include "cloudprovidermanager.h" - #include "account.h" diff --git a/sources b/sources index 986a2f8..e42895e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-3.1.3.tar.gz) = ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99 +SHA512 (desktop-3.2.0.tar.gz) = a1773ba767b10e2daeda0b188a837e2894166b131908de1795d39a61d487664348aaf4547f36435fef2b2b83dc6520445d28df587d74990bdaebe997aa0bd1dc