From 73f22807b9384a7eb1228918a28cdf1e9590c56b9068ccc3a26218b8095aaa96 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 5 Nov 2008 23:17:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boinc-client?expand=0&rev=2 --- bnc_439037.patch | 12 ++++++++++++ boinc-client.changes | 6 ++++++ boinc-client.spec | 9 +++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 bnc_439037.patch diff --git a/bnc_439037.patch b/bnc_439037.patch new file mode 100644 index 0000000..a558686 --- /dev/null +++ b/bnc_439037.patch @@ -0,0 +1,12 @@ +diff -Naur boinc-6.2.18/client/hostinfo_unix.C boinc-6.2.18-mp/client/hostinfo_unix.C +--- boinc-6.2.18/client/hostinfo_unix.C 2008-08-25 20:29:18.000000000 +0000 ++++ boinc-6.2.18-mp/client/hostinfo_unix.C 2008-11-03 17:50:19.000000000 +0000 +@@ -248,7 +248,7 @@ + // we need to find the right ac adapter first + DirScanner dir("/proc/acpi/ac_adapter/"); + while (dir.scan(ac_name)) { +- if ((ac_name.c_str()==".")||(ac_name.c_str()=="..")) continue; ++ if ((strcmp(ac_name.c_str(),".")==0)||(strcmp(ac_name.c_str(),"..")==0)) continue; + + // newer ACPI versions use "state" as filename + sprintf(ac_state, "/proc/acpi/ac_adapter/%s/state", ac_name.c_str()); diff --git a/boinc-client.changes b/boinc-client.changes index 14cd37f..24449bc 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 3 17:57:24 UTC 2008 - mauro@suse.de + +- Add bnc_439037.patch to fix bnc#439037. We now use strcmp + instead of the original ==. + ------------------------------------------------------------------- Sat Oct 4 05:44:49 CEST 2008 - mauro@suse.de diff --git a/boinc-client.spec b/boinc-client.spec index d0e5b2d..0953cc8 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -21,7 +21,7 @@ Name: boinc-client Summary: The Berkeley Open Infrastructure for Network Computing (BOINC) Version: 6.2.18 -Release: 1 +Release: 2 Url: http://boinc.berkeley.edu/ Source0: boinc-%{version}.tar.bz2 Source1: boinc-icons.tar.bz2 @@ -34,6 +34,7 @@ Patch2: boinc-rcscript.patch Patch3: boinc-sysconfig.patch Patch4: boinc-subdirs.patch Patch5: bnc-431510.patch +Patch6: bnc_439037.patch License: LGPL v2.1 only Group: Productivity/Clustering/Computing BuildRequires: libcurl-devel >= 7.15.2 python-mysql update-desktop-files @@ -151,6 +152,7 @@ mkdir $RPM_BUILD_ROOT %patch3 %patch4 %patch5 -p1 +%patch6 -p1 tar -xvjf %{S:1} %build @@ -237,8 +239,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*a %changelog +* Mon Nov 03 2008 mauro@suse.de +- Add bnc_439037.patch to fix bnc#439037. We now use strcmp + instead of the original ==. * Sat Oct 04 2008 mauro@suse.de - Add bnc-431510.patch to fix bnc#431510. -* Tue Sep 09 2008 mauro@suse.de +* Mon Sep 08 2008 mauro@suse.de - initial package for SuSE. boinc 6.2.18 (based on the enzokiel's opensuse version).