rpms/boinc-client/F-9 boinc-cuda.patch, NONE, 1.1 boinc-client-init-d, 1.7, 1.8 boinc-client.spec, 1.19, 1.20
Miloš Jakubíček
mjakubicek at fedoraproject.org
Fri Mar 27 01:11:08 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25300
Modified Files:
boinc-client-init-d boinc-client.spec
Added Files:
boinc-cuda.patch
Log Message:
* Thu Mar 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-7.r17542svn
- Split most documentation into a separate -doc subpackage (resolves #492442).
* Thu Mar 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-6.r17542svn
- Mark sysconfig configuration as %%config(noreplace).
- Minor changes in the init script.
- Added patch to enable dlopen() system-wide CUDA libraries, if present.
boinc-cuda.patch:
--- NEW FILE boinc-cuda.patch ---
--- lib/coproc.cpp.orig 2009-03-22 14:21:36.000000000 +0100
+++ lib/coproc.cpp 2009-03-22 14:21:45.000000000 +0100
@@ -138,7 +138,7 @@
#ifdef __APPLE__
cudalib = dlopen("/usr/local/cuda/lib/libcudart.dylib", RTLD_NOW);
#else
- cudalib = dlopen("./libcudart.so", RTLD_NOW);
+ cudalib = dlopen("libcudart.so", RTLD_NOW);
#endif
if (!cudalib) {
return "Can't load library libcudart";
Index: boinc-client-init-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client-init-d,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- boinc-client-init-d 18 Mar 2009 10:35:30 -0000 1.7
+++ boinc-client-init-d 27 Mar 2009 01:10:38 -0000 1.8
@@ -13,7 +13,6 @@
# For more information about BOINC (the Berkeley Open Infrastructure
# for Network Computing) see http://boinc.berkeley.edu
# processname: boinc-client
-# pidfile: /var/run/boinc-client.pid
# config: /etc/sysconfig/boinc-client
#
### BEGIN INIT INFO
@@ -67,7 +66,7 @@
prog=boinc-client
-# Subsys lock file and pid file
+# Subsys lock file
LOCKFILE="/var/lock/subsys/$prog"
@@ -97,7 +96,7 @@
exit 2
fi
-# Warn if there're no projects attached
+# Warn if there are no projects attached
cd $BOINCDIR
if [ ! -d projects ] ; then
@@ -107,11 +106,11 @@
fi
check_status() {
- status $BOINCEXE
+ status $BOINCEXE >& /dev/null
}
start() {
- check_status >& /dev/null && exit 0
+ check_status && exit 0
echo -n $"Starting $prog: "
# Check that we're a privileged user
@@ -135,16 +134,16 @@
# Check that boinc is running, give it a few tries
TRY=0
while [ $TRY -lt 10 ] ; do
- check_status >& /dev/null && { touch $LOCKFILE; success; echo; return; } || sleep 1
+ check_status && { touch $LOCKFILE; success; echo; return; } || sleep 1
let TRY+=1
done;
- check_status >& /dev/null && { touch $LOCKFILE; success; } || failure
+ check_status && { touch $LOCKFILE; success; } || failure
echo
}
stop() {
cd $BOINCDIR
- check_status >& /dev/null || exit 0
+ check_status || exit 0
echo -n $"Stopping $prog: "
killproc -d 10 $BOINCEXE
rm -f $LOCKFILE
@@ -152,8 +151,8 @@
}
reload() {
- check_status >& /dev/null || { start; exit; }
- action "Reading configuration: " $BOINCCMD --read_cc_config
+ check_status || { start; exit; }
+ action "Reading configuration: " $BOINCCMD --read_cc_config | sed -e "s/retval.*//" -e "N;s/\n//;"
}
restart() {
@@ -183,7 +182,7 @@
restart
;;
status)
- check_status
+ status $BOINCEXE
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- boinc-client.spec 18 Mar 2009 10:35:30 -0000 1.19
+++ boinc-client.spec 27 Mar 2009 01:10:38 -0000 1.20
@@ -4,7 +4,7 @@
Summary: The BOINC client core
Name: boinc-client
Version: 6.4.7
-Release: 5.r%{revision}svn%{?dist}
+Release: 7.r%{revision}svn%{?dist}
License: LGPLv2+
Group: Applications/Engineering
URL: http://boinc.berkeley.edu/
@@ -38,12 +38,17 @@
#Patch5: boinc-client-6.4.5-event.patch
#Create password file rw for group, this enables passwordless connection
#of manager from users of the boinc group.
+#This won't be probably upstreamed as it might be unsafe for common usage
+#without setting proper group ownership of the password file.
Patch6: boinc-guirpcauth.patch
+#Enable dlopening libcudart.so from standard paths
+#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/863
+Patch7: boinc-cuda.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: logrotate
Requires: chkconfig
-Requires(pre): shadow-utils
+Requires(pre): shadow-utils
BuildRequires: MySQL-python
BuildRequires: curl-devel
@@ -52,10 +57,10 @@
BuildRequires: mesa-libGLU-devel
BuildRequires: openssl-devel
BuildRequires: wxGTK-devel
-BuildRequires: gettext
-BuildRequires: mysql-devel
-BuildRequires: libXmu-devel
-BuildRequires: libjpeg-devel
+BuildRequires: gettext
+BuildRequires: mysql-devel
+BuildRequires: libXmu-devel
+BuildRequires: ibjpeg-devel
BuildRequires: docbook2X
%description
@@ -99,6 +104,15 @@
%description devel
This package contains development files for %{name}.
+%package doc
+Summary: Documentation files for %{name}
+Group: Documentation
+
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+This package contains documentation files for %{name}.
+
%prep
%setup -q -n boinc_core_release_%{version_}
%patch1 -p1
@@ -107,6 +121,7 @@
#%patch4
#%patch5 -p1
%patch6
+%patch7
# fix utf8
iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8
@@ -276,21 +291,23 @@
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/bash_completion.d/
-%doc COPYING COPYRIGHT checkin_notes checkin_notes_2007 checkin_notes_2006
-%doc checkin_notes_2005 checkin_notes_2004 checkin_notes_2003 checkin_notes_2002
-%doc USAGE_FEDORA
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%doc COPYING COPYRIGHT USAGE_FEDORA
%{_bindir}/boinc
%{_bindir}/boinc_client
%{_bindir}/boinccmd
%{_bindir}/crypt_prog
%{_bindir}/switcher
%{_initrddir}/%{name}
-%{_sysconfdir}/sysconfig/%{name}
%{_mandir}/man1/boinccmd.1.gz
%{_mandir}/man1/boinc.1.gz
%defattr(-,boinc,boinc,-)
%{_localstatedir}/lib/boinc/
+%files doc
+%defattr(-,root,root,-)
+%doc checkin_notes checkin_notes_2007 checkin_notes_2006 checkin_notes_2005 checkin_notes_2004 checkin_notes_2003 checkin_notes_2002
+
%files -n boinc-manager -f BOINC-Manager.lang
%defattr(-,root,root,-)
%{_bindir}/boinc_gui
@@ -313,6 +330,14 @@
%{_includedir}/boinc/*
%changelog
+* Thu Mar 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-7.r17542svn
+- Split most documentation into a separate -doc subpackage (resolves #492442).
+
+* Thu Mar 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-6.r17542svn
+- Mark sysconfig configuration as %%config(noreplace).
+- Minor changes in the init script.
+- Added patch to enable dlopen() system-wide CUDA libraries, if present.
+
* Tue Mar 17 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-5.r17542svn
- Wait longer when checking start/stop result in the init script.
More information about the fedora-extras-commits
mailing list