X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dropbox.spec;h=423a6be3a005b3c3de5f2456d9e1908be240bc70;hb=0b1f9be2a96870e64b40b0c37be19bf71a604eac;hp=bfe49c5937a1a8f1c4e044948bd6f2bfdb2ef00e;hpb=5948e56cf7c91472ac7cfff5233f6d9d3a2e3a6d;p=packages%2Fdropbox.git

diff --git a/dropbox.spec b/dropbox.spec
index bfe49c5..423a6be 100644
--- a/dropbox.spec
+++ b/dropbox.spec
@@ -9,15 +9,16 @@
 #   http://wiki.dropbox.com/TipsAndTricks/TextBasedLinuxInstall
 Summary:	Sync and backup files between computers
 Name:		dropbox
-Version:	3.6.7
+# https://www.dropboxforum.com/hc/en-us/community/posts/206682016-New-Versioning-Scheme
+Version:	34.4.20
 Release:	1
 License:	Proprietary
 Group:		Daemons
 Source0:	http://dl-web.dropbox.com/u/17/%{name}-lnx.x86-%{version}.tar.gz
-# NoSource0-md5:	cadb829fcee716c69431c39aa599deca
+# NoSource0-md5:	4489bdc214fd553a1128ec441705eedd
 NoSource:	0
 Source1:	http://dl-web.dropbox.com/u/17/%{name}-lnx.x86_64-%{version}.tar.gz
-# NoSource1-md5:	ab4c28a1f19e116c239db24932ac32df
+# NoSource1-md5:	65dcb4c49a6808f2495912b4cc84a7ce
 NoSource:	1
 URL:		http://www.dropbox.com/
 BuildRequires:	rpmbuild(macros) >= 1.566
@@ -80,23 +81,30 @@ mv dropbox-lnx.*-%{version}/* .
 #%{__rm} -r distribute-0.6.26-py2.7.egg
 
 # libraries to be taken from system
-# for a in *.so*; do ls -ld /lib64/$a %{_libdir}/$a; done 2>/dev/null
+# for a in *.so*; do ls -ld /lib64/$a /us?/lib64/$a; done 2>/dev/null
 %{__rm} libpopt.so.0 libdrm.so.2 libGL.so.1
-#%{__rm} libffi.so.6 librsync.so.1
-#%{__rm} libQt5{Core,DBus,Gui,Network,OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets,Widgets}.so.5
+%{__rm} libffi.so.6
+%{__rm} libX11-xcb.so.1
+%{__rm} libQt5{Core,DBus,Gui,Network,OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets,Widgets,XcbQpa}.so.5
+%{__rm} qt.conf
+%{__rm} -r plugins
 
-# make into symlink, looks cleaner than hardlink:
-# we can attach executable attrs to binary and leave no attrs for symlink in
-# %files section.
-ln -sf dropbox library.zip
+# keep librsync, won't finish syncing if not using upstream copy
+test -f librsync.so.1
 
 # fun, let's delete non-linux files from archive
 unzip -l library.zip | \
-	grep -E '(arch|dropbox)/(mac|win32)|_(win32|mac).py|pymac|ui/cocoa|unittest' | \
-	grep -vE 'pymac/(__init__|constants|types|lazydll|lazyframework).py' | \
+	grep -E '(arch|dropbox)/(mac|win32)|_(win32|mac)\.py|pymac|ui/cocoa|unittest' | \
+	grep -vE 'pymac/(__init__|constants|types|lazydll|lazyframework)\.py' | \
+	grep -vE 'dropbox/mac/(version|__init__).py' | \
 	awk '{print $NF}' > lib.delete
 zip library.zip -d $(cat lib.delete)
 
+# make into symlink, looks cleaner than hardlink:
+# we can attach executable attrs to binary and leave no attrs for symlink in
+# %files section.
+ln -sf dropbox library.zip
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -123,33 +131,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/dropboxd
 %{_libdir}/%{name}/library.zip
 
-%{_libdir}/%{name}/certifi-*-py*.egg
-%{_libdir}/%{name}/cffi-*-py*.egg
+# need +x bits for .so files
+%defattr(-,root,root,-)
 %{_libdir}/%{name}/dropbox_sqlite_ext-*-py*.egg
-%{_libdir}/%{name}/futures-*-py*.egg
-%{_libdir}/%{name}/mock-*-py*.egg
-%{_libdir}/%{name}/psutil-*-py*.egg
-%{_libdir}/%{name}/requests-*-py*.egg
 %{_libdir}/%{name}/setuptools-*-py*.egg
-%{_libdir}/%{name}/tornado-*-py*.egg
 
 # GUI parts
 %exclude %{_libdir}/%{name}/PyQt5.*.so
-%exclude %{_libdir}/%{name}/libQt5*.so.5
-%exclude %{_libdir}/%{name}/libX11-xcb.so.1
 %exclude %{_libdir}/%{name}/dbus.mainloop.pyqt5.so
 
 %files gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/wmctrl
 %attr(755,root,root) %{_libdir}/%{name}/PyQt5.*.so
-%attr(755,root,root) %{_libdir}/%{name}/libQt5*.so.5
-%attr(755,root,root) %{_libdir}/%{name}/libX11-xcb.so.1
 %attr(755,root,root) %{_libdir}/%{name}/dbus.mainloop.pyqt5.so
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/plugins/platforms
-%attr(755,root,root) %{_libdir}/%{name}/plugins/platforms/libqxcb.so
-%{_libdir}/%{name}/qt.conf
 %dir %{_libdir}/%{name}/images
 %{_libdir}/%{name}/images/emblems
 %{_libdir}/%{name}/images/hicolor
+%{_libdir}/%{name}/resources