PR#2: Update to 7.0.10 - rpms/seafile-client

rpms / seafile-client

#2 Update to 7.0.10

Merged 3 years ago by jujens. Opened 3 years ago by alebastr.

Unknown source master into master

Update to 7.0.10

Aleksei Bavshin • 3 years ago

0329025

Update license and provides for bundled sources

Aleksei Bavshin • 3 years ago

d33f336

Spec cleanup: remove unused deps, update for current guidelines

Aleksei Bavshin • 3 years ago

2d30509

.gitignore

file modified

+1 -13

		`@@ -1,13 +1,1 @@`
		`- /v5.1.1.tar.gz`
		`- /v6.0.0.tar.gz`
		`- /v6.0.4.tar.gz`
		`- /v6.0.6.tar.gz`
		`- /v6.1.0.tar.gz`
		`- /v6.1.3.tar.gz`
		`- /v6.1.4.tar.gz`
		`- /v6.1.6.tar.gz`
		`- /v6.2.3.tar.gz`
		`- /v6.2.5.tar.gz`
		`- /v6.2.11.tar.gz`
		`- /v7.0.2.tar.gz`
		`- /v7.0.4.tar.gz`
		`+ /seafile-*.tar.gz`

seafile-client.spec

file modified

+45 -27

		`@@ -1,32 +1,43 @@`
		`- %global __cmake_in_source_build 1`
		`%global _hardened_build 1`

		`Name: seafile-client`
		`- Version: 7.0.4`
		`- Release: 4%{?dist}`
		`+ Version: 7.0.10`
		`+ Release: 1%{?dist}`
		`Summary: Seafile cloud storage desktop client`

		`- License: ASL 2.0`
		`+ # main source: Apache 2.0`
		`+ # quazip: LGPL 2.1 with static linking exception`
		`+ # QtAwesome: MIT`
		`+ # fontawesome: OFL`
		`+ License: ASL 2.0 and LGPLv2 and MIT and OFL`
		`URL: https://www.seafile.com/`
		`- Source0: https://github.com/haiwen/%{name}/archive/v%{version}.tar.gz`
		`+ Source0: https://github.com/haiwen/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz`
		`Source1: seafile.appdata.xml`
		`Patch0: fix-qt-build.patch`

		`+ ExclusiveArch: %{qt5_qtwebengine_arches}`
		`+`
		`+ BuildRequires: cmake`
		`+ BuildRequires: gcc-c++`
		`BuildRequires: desktop-file-utils`
		`BuildRequires: libappstream-glib`
		`- BuildRequires: cmake`
		`- BuildRequires: sqlite-devel`
		`- BuildRequires: jansson-devel`
		`- BuildRequires: openssl-devel`
		`- BuildRequires: libuuid-devel`
		`- BuildRequires: libsearpc-devel`
		`- BuildRequires: ccnet-devel`
		`- BuildRequires: seafile-devel = %{version}`
		`- BuildRequires: qt5-qtbase`
		`- BuildRequires: qt5-qtwebkit-devel`
		`- BuildRequires: qt5-qttools`
		`- BuildRequires: qt5-qttools-devel`
		`-`
		`+ BuildRequires: make`
		`+`
		`+ BuildRequires: pkgconfig(sqlite3)`
		`+ BuildRequires: pkgconfig(jansson)`
		`+ BuildRequires: pkgconfig(libevent)`
		`+ BuildRequires: pkgconfig(libsearpc)`
		`+ BuildRequires: pkgconfig(libseafile) = %{version}`
		`+ BuildRequires: pkgconfig(openssl)`
		`+ BuildRequires: pkgconfig(zlib)`
		`+ BuildRequires: qt5-qtbase-devel`
		`+ BuildRequires: qt5-qtwebengine-devel`
		`+ BuildRequires: qt5-linguist`
		`+`
		`+ # 3.x.unidentified with local changes`
		`+ Provides: bundled(QtAwesome)`
		`+ Provides: bundled(fontawesome-fonts) = 3.2.1`
		`+ Provides: bundled(quazip) = 0.7.3`
		`Requires: seafile = %{version}`


		`@@ -39,20 +50,23 @@`


		`%prep`
		`- %autosetup -p1 -n %{name}-%{version}`
		`+ %autosetup -p1`


		`%build`
		`- %cmake -DUSE_QT5=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_SHIBBOLETH_SUPPORT=ON .`
		`- make CFLAGS="%{optflags}" %{?_smp_mflags}`
		`+ %cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHIBBOLETH_SUPPORT=ON`
		`+ %cmake_build`


		`%install`
		`- make install DESTDIR=%{buildroot}`
		`- desktop-file-validate %{buildroot}/%{_datadir}/applications/seafile.desktop`
		`- mkdir -p %{buildroot}%{_datarootdir}/appdata/`
		`- install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/seafile.appdata.xml`
		`- appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/seafile.appdata.xml`
		`+ %cmake_install`
		`+ install -D -m 644 -pv %{SOURCE1} %{buildroot}%{_metainfodir}/seafile.appdata.xml`
		`+`
		`+`
		`+ %check`
		`+ desktop-file-validate %{buildroot}%{_datadir}/applications/seafile.desktop`
		`+ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/seafile.appdata.xml`
		`+`

		`%files`
		`%doc README.md`
		`@@ -67,10 +81,14 @@`
		`%{_datadir}/icons/hicolor/48x48/apps/seafile.png`
		`%{_datadir}/icons/hicolor/128x128/apps/seafile.png`
		`%{_datadir}/pixmaps/seafile.png`
		`- %{_datadir}/appdata/seafile.appdata.xml`
		`+ %{_metainfodir}/seafile.appdata.xml`


		`%changelog`
		`+ * Fri Nov 06 2020 Aleksei Bavshin <alebastr@fedoraproject.org> - 7.0.10-1`
		`+ - Update to 7.0.10`
		`+ - Spec cleanup: remove unused deps, update for current guidelines`
		`+`
		`* Sat Jul 25 2020 Marie Loise Nolden <loise@kde.org> - 7.0.4-4`
		`- fix qt 5.15 build (append Patch0)`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (v7.0.4.tar.gz) = 9073df49639045319e971a76eb3769c184617e179694981ad88ddd02382b4ca50ff92c26239757022270e0a0a4115c8b70ca7efeab6ff2dee78e90a7de1bf5a7`
		`+ SHA512 (seafile-client-7.0.10.tar.gz) = cab11292ab1957b1682e0d3ee1ddd8e794c52bba7cf08ed39e8f598d3549247c20214d907d1e3792c06a36d8bea55c0bd25ce9aa3a802c262f9af785da7cb340`

alebastr commented 3 years ago

As I mentioned in libsearpc PR, I'm moving all my local changes to the client packages into Fedora upstream

Things to note:
- pkgconfig(...) style deps for anything requested with PKG_CHECK_MODULES as recommended by the current packaging guidelines
- ccnet is no longer required by any of seafile packages.
- third party sources used during the build are now properly declared and used for license calculation (packaging-guidelines#bundling)
- qtwebkit is replaced with qtwebengine. QtWebKit is a one large security issue with no upstream development (rhbz#1872819) and it's good that Seafile devs made this change. However now we have to add ExclusiveArch: %{qt5_qtwebengine_arches} to disable build on architectures not supported by qtwebengine (ppc64le and s390x)

Copr with builds from these sources: alebastr/seafile-client

jujens commented 3 years ago

Thanks for your contributions. Can you trigger a rebuild for this package on koji now that I have merged all your other PRs?

alebastr commented 3 years ago

Koji CI is failing because it is unable to find seafile-devel = 7.0.10 in rawhide buildroot.
The only way to fix this that I'm aware of is to build other two packages in rawhide, wait until the buildroot is regenerated (koji wait-repo ...) and force-push this branch to trigger CI rebuild. I believe I have access to do that, but it would be easier just to merge this PR and chain-build all 3 packages in rawhide.

On an unrelated subject: I've got SeaDrive reviews approved and will be adding the packages later today. Would you like to have commit access to those? It may come in handy if you need to rebuild everything in the unlikely case of ABI-breaking libsearpc update.

jujens commented 3 years ago

Sorry for the delay, I've been quit busy ;-)

Do you want to co-maintain the seafile packages?
If updating seafile or its dependencies can break SeaDrive, yes I'd like commit access to solve it ;-)

Pull-Request has been merged by jujens

3 years ago

alebastr commented 3 years ago

Sorry for the delay, I've been quit busy ;-)

Do you want to co-maintain the seafile packages?

I'll be happy to help with seafile maintenance, thanks for the offer :smile:

If updating seafile or its dependencies can break SeaDrive, yes I'd like commit access to solve it ;-)

Changes in libsearpc could affect seadrive. It's been a while since the last significant change but things could happen. I'll add you to these packages.

alebastr commented 3 years ago

Thanks for the access!
Rawhide build succeeded and I'm planning to prepare f33 updates tomorrow.