From 74b63951d20b800d341793e60ee3c91078dac841e7d441f6558e6a70ac42a245 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Fri, 10 Feb 2012 23:18:48 +0000 Subject: [PATCH] Accepting request 103766 from home:computersalat:branches:network fix for bnc#732118, bnc#744389, bnc#744612, bnc#745887 OBS-URL: https://build.opensuse.org/request/show/103766 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=23 --- boinc-client.changes | 13 +++++++++++++ boinc-client.spec | 16 +++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/boinc-client.changes b/boinc-client.changes index 2e97bca..328b595 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Feb 10 23:07:01 UTC 2012 - chris@computersalat.de + +- fix sed for boinc-manager + +------------------------------------------------------------------- +Wed Feb 8 22:51:55 UTC 2012 - chris@computersalat.de + +- fix for bnc#745887 ( Confirm licensing of boinc-client 6.10.60 ) +- fix for bnc#744612 ( File /usr/bin/boinc_gui incorrectly named ) +- fix for bnc#744389 ( boinc-client will not run ) +- fix for bnc#732118 ( BOINC installs but will not run ) + ------------------------------------------------------------------- Wed Feb 8 22:39:34 UTC 2012 - chris@computersalat.de diff --git a/boinc-client.spec b/boinc-client.spec index 65e7535..b53564e 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -19,7 +19,9 @@ # Global definitions %define _use_internal_dependency_generator 0 +%if 0%{?suse_version} >= 1140 %define __find_requires %wx_requires +%endif %define version_ 6_10_60 %define soname 6 %define boinc_dir %{_localstatedir}/lib/boinc @@ -37,7 +39,6 @@ Source2: boinc-gui.desktop Source3: README.SUSE Source4: sysconfig.%{name} Source5: boinc-logrotate -#Source6: boincmanager Source6: boinc-manager # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: @@ -111,8 +112,6 @@ BuildRequires: wxWidgets-devel >= 2.8.7 Requires: logrotate Requires: cron -## !! Do not remove thie "hard" dependency !! -Requires: libboinc%{soname} = %{version}-%{release} %lang_package %lang_package -n boinc-manager @@ -135,7 +134,6 @@ of scientific and mathematical research. %package -n boinc-manager Summary: GUI to control and monitor boinc-client Group: Productivity/Scientific/Astronomy -#Requires: %{name} = %{version}-%{release} Requires: boinc-manager-lang = %{version}-%{release} Requires: hicolor-icon-theme @@ -206,6 +204,14 @@ pushd clientgui/res/skins/default/graphic/ %{__sed} -i 's/static char/static const char/g' *.xpm popd +### bnc#745656 +## remove files with questionable licenses +# removing NVIDIA owned file that does not clearly allow redistribution or +# modification +%{__rm} coprocs/CUDA/include/nvapi.h +# removing unnecessary APSL licensed files +%{__rm} client/app_stats_mac.cpp + %build #remove ltmain.sh & run libtoolize and ./_autosetup %{__rm} ltmain.sh @@ -258,7 +264,7 @@ popd # replace @boinc_dir@, @bindir@ %{__sed} -i \ - -e "s,@boincdir@,%{boinc_dir},g" \ + -e "s,@boinc_dir@,%{boinc_dir},g" \ -e "s,@bindir@,%{_bindir},g" \ %{buildroot}%{_bindir}/boinc-manager