rpms/boinc-client/devel boinc-macbuild.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 boinc-client-6.4.5-event.patch, 1.1, 1.2 boinc-client-logrotate-d, 1.3, 1.4 boinc-client.spec, 1.35, 1.36 sources, 1.5, 1.6 trim, 1.2, 1.3 boinc-locales.patch, 1.2, NONE
Miloš Jakubíček
mjakubicek at fedoraproject.org
Mon Jul 20 00:01:26 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30812
Modified Files:
.cvsignore boinc-client-6.4.5-event.patch
boinc-client-logrotate-d boinc-client.spec sources trim
Added Files:
boinc-macbuild.patch
Removed Files:
boinc-locales.patch
Log Message:
- Update to 6.6 branch
- Removed boinc-locales.patch (merged upstream)
- Added boinc-macbuild.patch to fix ppc/ppc64 build failure
- Fixed typo in upstream bugtracker link
- Condrestart the service after package update.
- Added R: initscripts (needed for /sbin/service), chkconfig R: moved to scriptlets.
boinc-macbuild.patch:
gui_rpc_server.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE boinc-macbuild.patch ---
--- boinc_core_release_6_6/client/gui_rpc_server.cpp.orig 2009-07-19 17:04:24.000000000 +0200
+++ boinc_core_release_6_6/client/gui_rpc_server.cpp 2009-07-19 17:04:32.000000000 +0200
@@ -351,7 +351,7 @@
}
boinc_socklen_t addr_len = sizeof(addr);
- sock = accept(lsock, (struct sockaddr*)&addr, (boinc_socklen_t*)&addr_len);
+ sock = accept(lsock, (struct sockaddr*)&addr, (socklen_t*)&addr_len);
if (sock == -1) {
return;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 7 Mar 2009 01:36:16 -0000 1.5
+++ .cvsignore 20 Jul 2009 00:00:55 -0000 1.6
@@ -1 +1 @@
-boinc-6.4.7.tar.bz2
+boinc-6.6.37.tar.bz2
boinc-client-6.4.5-event.patch:
wxFlatNotebook.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: boinc-client-6.4.5-event.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-6.4.5-event.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- boinc-client-6.4.5-event.patch 24 Feb 2009 21:38:55 -0000 1.1
+++ boinc-client-6.4.5-event.patch 20 Jul 2009 00:00:55 -0000 1.2
@@ -2,11 +2,11 @@ diff -up boinc_core_release_6_4_5/client
--- boinc_core_release_6_4_5/clientgui/common/wxFlatNotebook.cpp.event 2009-02-20 07:35:19.000000000 -0500
+++ boinc_core_release_6_4_5/clientgui/common/wxFlatNotebook.cpp 2009-02-20 07:34:40.000000000 -0500
@@ -607,7 +607,7 @@ const wxColour& wxFlatNotebookBase::GetA
- //
- ///////////////////////////////////////////////////////////////////////////////////////////
-
--BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)
-+BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)
- EVT_PAINT(wxPageContainerBase::OnPaint)
- EVT_SIZE(wxPageContainerBase::OnSize)
- EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)
+ //
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+-BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)
++BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)
+ EVT_PAINT(wxPageContainerBase::OnPaint)
+ EVT_SIZE(wxPageContainerBase::OnSize)
+ EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)
Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-logrotate-d,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- boinc-client-logrotate-d 14 Apr 2009 16:06:09 -0000 1.3
+++ boinc-client-logrotate-d 20 Jul 2009 00:00:55 -0000 1.4
@@ -10,7 +10,7 @@
# Author: Kathryn Marks <kathryn.boinc at gmail.com>
# Created: October 6, 2007
# Modified: Milos Jakubicek <xjakub at fi.muni.cz>
-# Last Modified: April 12, 2009
+# Last Modified: July 19, 2009
######################################################################
/var/log/boinc.log /var/log/boincerr.log
@@ -24,13 +24,13 @@
sharedscripts
prerotate
if [ -f /var/lock/subsys/boinc-client ]; then
- touch /var/run/boinc_was_running
+ touch /tmp/boinc_was_running
service boinc-client stop >& /dev/null
fi
endscript
postrotate
- if [ -f /var/run/boinc_was_running ]; then
- rm /var/run/boinc_was_running
+ if [ -f /tmp/boinc_was_running ]; then
+ rm /tmp/boinc_was_running
service boinc-client start >& /dev/null
fi
endscript
Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- boinc-client.spec 14 Apr 2009 16:06:09 -0000 1.35
+++ boinc-client.spec 20 Jul 2009 00:00:55 -0000 1.36
@@ -1,10 +1,10 @@
-%define revision 17542
-%define version_ 6_4
+%define revision 18631
+%define version_ 6_6
Summary: The BOINC client core
Name: boinc-client
-Version: 6.4.7
-Release: 10.r%{revision}svn%{?dist}
+Version: 6.6.37
+Release: 1.r%{revision}svn%{?dist}
License: LGPLv2+
Group: Applications/Engineering
URL: http://boinc.berkeley.edu/
@@ -12,6 +12,11 @@ URL: http://boinc.berkeley.edu/
# following commands to generate the tarball:
# svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_}
# pushd boinc_core_release_%{version_}
+# mkdir locale/client
+# touch locale/client/Makefile.in
+# mkdir -p packages/generic/sea/
+# touch packages/generic/sea/Makefile.in
+# sed -i "s/BUILD_CLIENTGUI/ENABLE_MANAGER/" doc/manpages/Makefile.am
# ./_autosetup
# ./trim . Trim all binaries and other unnecessary things.
# popd
@@ -27,13 +32,8 @@ Patch1: boinc-gccflags.patch
#Fix security bug BZ#479664
#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823
Patch2: boinc-rsa.patch
-#Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo"
-#so that we can use the find_lang macro.
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722
-#Fixed in SVN trunk, not yet in BOINC 6 branch.
-Patch3: boinc-locales.patch
#Both of these patches fix the gcc 4.4 build
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823
+#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/854
Patch4: boinc-gcc44.patch
Patch5: boinc-client-6.4.5-event.patch
#Create password file rw for group, this enables passwordless connection
@@ -44,10 +44,15 @@ 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
+#Fix Mac build:
+Patch8: boinc-macbuild.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: logrotate
-Requires: chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
Requires(pre): shadow-utils
BuildRequires: MySQL-python
@@ -118,11 +123,11 @@ This package contains documentation file
%setup -q -n boinc_core_release_%{version_}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4
%patch5 -p1
%patch6
%patch7
+%patch8 -p1
# fix utf8
iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8
@@ -148,12 +153,21 @@ mv checkin_notes_2006.utf8 checkin_notes
%define boinc_platform ppc64-linux-gnu
%endif
-#quick fix to make build & install to work, filed in upstream's bugtracker under
+#quick fixes to make build & install to work, filed in upstream's bugtracker under
#http://boinc.berkeley.edu/trac/ticket/811
+# - this should just go away
sed -i "s/boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png//" clientgui/res/Makefile.in
+# - missing in the Makefile
echo "install:" >> samples/example_app/Makefile
+# - because "-lssl" is needed
+sed -i 's/crypt_prog_LDADD = $(lib_LIBRARIES) $(RSA_LIBS) $(PTHREAD_LIBS)/crypt_prog_LDADD = $(lib_LIBRARIES) $(RSA_LIBS) $(PTHREAD_LIBS) $(BOINC_EXTRA_LIBS)/' lib/Makefile.in
+# - because "-lcurl" is needed
+sed -i 's/boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)/boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) $(BOINC_EXTRA_LIBS)/' client/Makefile.in
+
+#We want to install .mo, not .po files, see http://boinc.berkeley.edu/trac/ticket/940
+sed -i 's/BOINC-Manager\.po/BOINC-Manager\.mo/g' locale/Makefile.in
-%define confflags --disable-static --enable-unicode STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
+%define confflags --disable-static --disable-server --disable-fcgi --enable-unicode --with-ssl --with-x STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
%if %{defined boinc_platform}
%configure %{confflags} --with-boinc-platform=%{boinc_platform}
@@ -162,7 +176,9 @@ echo "install:" >> samples/example_app/M
%endif
-# Parallel make does not work.
+# Parallel make does not work, see upstream bugtracker at:
+# http://boinc.berkeley.edu/trac/ticket/775
+echo -e "all:\ninstall:" >> locale/client/Makefile
make
%install
@@ -234,12 +250,6 @@ desktop-file-install %{?_remove_encoding
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE3}
-# locales
-mv locale/client/* locale
-find locale -not -name "BOINC Manager.mo" -type f -delete
-cp -rp locale $RPM_BUILD_ROOT%{_datadir}
-find $RPM_BUILD_ROOT%{_datadir}/locale -name "BOINC Manager.mo" -execdir mv {} BOINC-Manager.mo \;
-
%find_lang BOINC-Manager
# bash-completion
@@ -276,6 +286,12 @@ if [ $1 -eq 0 ]; then #if uninstalling,
/sbin/chkconfig --del boinc-client
fi
+%postun
+if [ "$1" -ge "1" ] ; then
+ /sbin/service boinc-client condrestart >/dev/null 2>&1 || :
+fi
+
+
%post -n boinc-manager
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -323,14 +339,22 @@ fi
%defattr(-,root,root,-)
%{_libdir}/libboinc.a
%{_libdir}/libboinc_api.a
-%{_libdir}/libboinc_zip.a
-%{_libdir}/libsched.a
%{_libdir}/libboinc_graphics2.a
%dir %{_includedir}/boinc
%{_includedir}/boinc/*
%changelog
+* Sun Jul 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.6.37-1.r18631svn
+- Update to 6.6 branch
+- Removed boinc-locales.patch (merged upstream)
+- Added boinc-macbuild.patch to fix ppc/ppc64 build failure
+- Fixed typo in upstream bugtracker link
+
+* Thu May 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-11.r17542svn
+- Condrestart the service after package update.
+- Added R: initscripts (needed for /sbin/service), chkconfig R: moved to scriptlets.
+
* Wed Apr 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-10.r17542svn
- Fix lock file name in logrotate script, do not override
global logrotate configuration (BZ#494179).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 7 Mar 2009 01:36:17 -0000 1.5
+++ sources 20 Jul 2009 00:00:56 -0000 1.6
@@ -1 +1 @@
-9593e6daa2d8604e274470065bd31b80 boinc-6.4.7.tar.bz2
+77f5a1cc0b305ff448cb1030956426f1 boinc-6.6.37.tar.bz2
Index: trim
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/trim,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- trim 1 Jan 2009 22:35:38 -0000 1.2
+++ trim 20 Jul 2009 00:00:56 -0000 1.3
@@ -9,7 +9,7 @@ fi
echo "Trimming directories..."
-DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs/CUDA/mswin"
+DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs"
for DIR in $DIRS; do
/bin/rm -rf $1/$DIR;
--- boinc-locales.patch DELETED ---
More information about the fedora-extras-commits
mailing list