From 03dad75fa3b4caf41cdcf96566a4093f02e8c890470286dca6be97bce46da1f4 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Thu, 26 Oct 2017 23:01:55 +0000 Subject: [PATCH] Accepting request 536998 from home:computersalat:devel:network update to 7.8.3 OBS-URL: https://build.opensuse.org/request/show/536998 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=66 --- ...GR-support-wxWidgets-without-webview.patch | 12 +++++----- boinc-client.changes | 24 +++++++++++++++++++ boinc-client.spec | 17 ++++++++++--- boinc-docbook2x.patch | 6 ++--- boinc-guirpcauth.patch | 6 ++--- xlocale.patch | 12 +++++----- 6 files changed, 56 insertions(+), 21 deletions(-) diff --git a/0001-MGR-support-wxWidgets-without-webview.patch b/0001-MGR-support-wxWidgets-without-webview.patch index 8ef04f9..6037998 100644 --- a/0001-MGR-support-wxWidgets-without-webview.patch +++ b/0001-MGR-support-wxWidgets-without-webview.patch @@ -10,10 +10,10 @@ with a wxHtmlWindow instead. clientgui/NoticeListCtrl.h | 8 ++++++++ 2 files changed, 33 insertions(+) -Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp +Index: boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.cpp =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/clientgui/NoticeListCtrl.cpp -+++ boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp +--- boinc-client_release-7.8-7.8.3.orig/clientgui/NoticeListCtrl.cpp ++++ boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.cpp @@ -49,10 +49,14 @@ IMPLEMENT_DYNAMIC_CLASS( CNoticeListCtrl BEGIN_EVENT_TABLE( CNoticeListCtrl, wxWindow ) @@ -80,10 +80,10 @@ Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp /*! -Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.h +Index: boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.h =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/clientgui/NoticeListCtrl.h -+++ boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.h +--- boinc-client_release-7.8-7.8.3.orig/clientgui/NoticeListCtrl.h ++++ boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.h @@ -45,8 +45,12 @@ public: ////@begin CNoticeListCtrl event handler declarations diff --git a/boinc-client.changes b/boinc-client.changes index d793804..dee4c7b 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Oct 26 22:39:03 UTC 2017 - chris@computersalat.de + +- Update to version 7.8.3. (aaronpuchert) +- Removed the deprecated "Encoding" line from the .desktop file. +- Updated the cleanup code: + * Permissions seem to be correct now. + * Line endings seem to be correct. + * Applied the UTF-8 conversion to the 2011 notes as well. +- Removed the entire coprocs/NVIDIA directory, since all files in + there have a doubtful license. +- Removed components that are not required for a Linux build. + +------------------------------------------------------------------- +Sun Sep 10 00:49:25 UTC 2017 - chris@computersalat.de + +- update to 7.8.2 + * no changelog available +- add {minor_version} +- rm wrong sim_web link +- fix files for SLES 11 +- remove obsolete patch + * 0001-Fix-1530-null-pointer-dereference.patch + ------------------------------------------------------------------- Fri Sep 8 09:38:10 UTC 2017 - jengelh@inai.de diff --git a/boinc-client.spec b/boinc-client.spec index 7b752e7..cce6d4f 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -29,7 +29,9 @@ %endif Name: boinc-client -Version: 7.8.3 +%define rel_name %{name}_release +%define minor_version 7.8 +Version: %{minor_version}.3 Release: 0 Summary: The BOINC client License: GPL-3.0+ or LGPL-3.0+ @@ -37,7 +39,7 @@ Group: Productivity/Clustering/Computing Url: http://boinc.berkeley.edu/ #Git-Clone: git://github.com/BOINC/boinc -Source0: https://github.com/BOINC/boinc/archive/client_release/7.8/%{version}.tar.gz +Source0: https://github.com/BOINC/boinc/archive/client_release/%{minor_version}/%{version}.tar.gz Source1: boinc-icons.tar.bz2 Source2: boinc-gui.desktop Source3: README.SUSE @@ -160,7 +162,7 @@ BuildArch: noarch This package contains documentation files for the BOINC client. %prep -%setup -q -n %{name}_release-7.8-%{version} -D -a 1 +%setup -q -n %{name}_release-%{minor_version}-%{version} -D -a 1 %patch -P 1 -P 2 -P 4 -P 5 -p1 %build @@ -307,6 +309,11 @@ ln -s -f boincmgr.1.gz %{buildroot}%{_mandir}/man1/boinc-manager.1.gz ln -s -f boinccmd.1.gz %{buildroot}%{_mandir}/man1/boinccmd.1.gz ln -s -f boinc.1.gz %{buildroot}%{_mandir}/man1/boinc.1.gz +### rm wrong link +cd doc +rm -f sim_web.php +ln -s sim/sim_web.php +cd - # Fix spurious-executable-perm chmod 0644 doc/*.php @@ -411,6 +418,10 @@ fi %files -n %{name}-lang -f BOINC-Client.lang %defattr(-,root,root) +%if 0%{?sles_version} == 11 +%dir %{_datadir}/locale/fa_IR +%dir %{_datadir}/locale/fa_IR/LC_MESSAGES +%endif %if %{with manager} %files -n boinc-manager diff --git a/boinc-docbook2x.patch b/boinc-docbook2x.patch index 609c50f..9e47c0a 100644 --- a/boinc-docbook2x.patch +++ b/boinc-docbook2x.patch @@ -8,10 +8,10 @@ of docbook2x-man. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: boinc-client_release-7.6-7.6.33/configure.ac +Index: boinc-client_release-7.8-7.8.3/configure.ac =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/configure.ac -+++ boinc-client_release-7.6-7.6.33/configure.ac +--- boinc-client_release-7.8-7.8.3.orig/configure.ac ++++ boinc-client_release-7.8-7.8.3/configure.ac @@ -334,7 +334,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`]) dnl Check for docbook2x-man, which we use to create the manpages in dnl doc/manpages, and set the conditional HAVE_DOCBOOK2X_MAN to build diff --git a/boinc-guirpcauth.patch b/boinc-guirpcauth.patch index cf7f504..8b48cd2 100644 --- a/boinc-guirpcauth.patch +++ b/boinc-guirpcauth.patch @@ -11,10 +11,10 @@ proper group ownership of the password file. client/gui_rpc_server.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -Index: boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp +Index: boinc-client_release-7.8-7.8.3/client/gui_rpc_server.cpp =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/client/gui_rpc_server.cpp -+++ boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp +--- boinc-client_release-7.8-7.8.3.orig/client/gui_rpc_server.cpp ++++ boinc-client_release-7.8-7.8.3/client/gui_rpc_server.cpp @@ -176,12 +176,7 @@ void GUI_RPC_CONN_SET::get_password() { // they can cause code to execute as this user. // So better protect it. diff --git a/xlocale.patch b/xlocale.patch index 0247e60..cd56b8e 100644 --- a/xlocale.patch +++ b/xlocale.patch @@ -9,10 +9,10 @@ glibc-2.26 has dropped xlocale.h. lib/gui_rpc_client.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp +Index: boinc-client_release-7.8-7.8.3/clientgui/AsyncRPC.cpp =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/clientgui/AsyncRPC.cpp -+++ boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp +--- boinc-client_release-7.8-7.8.3.orig/clientgui/AsyncRPC.cpp ++++ boinc-client_release-7.8-7.8.3/clientgui/AsyncRPC.cpp @@ -20,7 +20,7 @@ #endif @@ -22,10 +22,10 @@ Index: boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp #endif #include "stdwx.h" -Index: boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h +Index: boinc-client_release-7.8-7.8.3/lib/gui_rpc_client.h =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/lib/gui_rpc_client.h -+++ boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h +--- boinc-client_release-7.8-7.8.3.orig/lib/gui_rpc_client.h ++++ boinc-client_release-7.8-7.8.3/lib/gui_rpc_client.h @@ -807,7 +807,7 @@ struct RPC { #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)