forked from pool/boinc-client
Accepting request 391445 from network
- Update to new upstream release 7.6.32 OBS-URL: https://build.opensuse.org/request/show/391445 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boinc-client?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3e9cc7df90
3
7.6.32.tar.gz
Normal file
3
7.6.32.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:83cb65b8be32d53623c5d6e3890e4ed82ecc57efe56994a5b647ccb5da569832
|
||||
size 43560071
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dfff203487f9d030f916891074f978abde6c0d34b3147cfc36e42a5060b8d4b8
|
||||
size 40873943
|
||||
@ -1,20 +0,0 @@
|
||||
Index: locale/Makefile.am
|
||||
===================================================================
|
||||
--- locale/Makefile.am.orig
|
||||
+++ locale/Makefile.am
|
||||
@@ -45,12 +45,12 @@ locale_dirs = \
|
||||
install-data-hook:
|
||||
mydir=$(DESTDIR)$(datadir) ;\
|
||||
for ldir in $(locale_dirs) ; do \
|
||||
- $(INSTALL) -d $$mydir/$$ldir ; \
|
||||
+ $(INSTALL) -d $$mydir/$$ldir/LC_MESSAGES ; \
|
||||
if [ -f $$ldir/BOINC-Manager.mo ] ; then \
|
||||
- $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \
|
||||
+ $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo ; \
|
||||
fi ;\
|
||||
if [ -f $$ldir/BOINC-Client.mo ] ; then \
|
||||
- $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/BOINC-Client.mo ; \
|
||||
+ $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Client.mo ; \
|
||||
fi ;\
|
||||
done
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -45,6 +45,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX
|
||||
dnl ------
|
||||
AC_PROG_F77
|
||||
AC_PROG_CPP
|
||||
+AC_PROG_OBJCXX
|
||||
AC_PROG_MAKE_SET
|
||||
SAH_LINKS
|
||||
AC_LANG_PUSH(C)
|
||||
@@ -793,6 +794,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
|
||||
AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
|
||||
AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
|
||||
|
||||
+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
|
||||
+
|
||||
dnl ======================================================================
|
||||
dnl some more vodoo required for building portable client-binary (client, clientgui)
|
||||
dnl ======================================================================
|
||||
Index: clientgui/Makefile.am
|
||||
===================================================================
|
||||
--- clientgui/Makefile.am.orig
|
||||
+++ clientgui/Makefile.am
|
||||
@@ -117,9 +117,8 @@ EXTRA_DIST = *.h \
|
||||
../lib/error_numbers.h \
|
||||
locale $(mac_headers)
|
||||
|
||||
-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
|
||||
-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
|
||||
-boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) `pkg-config --libs gtk+-2.0` -lnotify
|
||||
+boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK2_CFLAGS)
|
||||
+boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS) -lnotify
|
||||
|
||||
win_config.h: $(top_srcdir)/config.h
|
||||
grep '#define.*BOINC.*VERSION' $^ > $@
|
||||
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 24 07:31:13 UTC 2016 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 7.6.32
|
||||
- Remove boinc-client-AM_CONDITIONAL.patch, boinc-configure.patch
|
||||
(no longer needed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 22 21:48:48 UTC 2016 - aaronpuchert@alice-dsl.net
|
||||
|
||||
- Replaced quick fix for compiler errors by a proper solution,
|
||||
which is already upstreamed.
|
||||
- Removed dependency to mysql, because that is only needed for the
|
||||
BOINC server, which we don't build anyway.
|
||||
- Removed dependency to libboinc, because it's meant to be
|
||||
statically linked to science apps and not necessary for end user.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 27 22:13:10 UTC 2016 - aaronpuchert@alice-dsl.net
|
||||
|
||||
- Update to version 7.6.22. The main advantage: GPUs running on
|
||||
the open source stack (Mesa) are now recognized and can be used
|
||||
for BOINC. Additional packages are needed though:
|
||||
* libOpenCL1,
|
||||
* libMesaOpenCL,
|
||||
* libclc.
|
||||
Further, the GPU device in /dev/dri needs to have r+w rights for
|
||||
the BOINC user, since it doesn't have access to the X session.
|
||||
- Fetch from GitHub instead of SVN, removed the fetch script
|
||||
- Rebased all patches, removed obsolete boinc-LC_MESSAGES.patch
|
||||
- Fixed compiler errors because openSUSEs wxWidgets is configured
|
||||
with wxUSE_STL=1, which is incompatible with BOINC. There is an
|
||||
open issue on GitHub: https://github.com/BOINC/boinc/issues/1515.
|
||||
- Building the manager and locales separately is no longer
|
||||
necessary.
|
||||
- The icons seem to have disappeared.
|
||||
- The BOINC manager should be called with the data directory
|
||||
instead of the binary directory. Otherwise it can't connect.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 24 10:53:06 UTC 2015 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
#
|
||||
# spec file for package boinc-client
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 by Aaron Puchert <aaronpuchert@alice-dsl.net>
|
||||
# Copyright (c) 2011 by Sascha Manns <saigkill@opensuse.org>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -19,40 +20,24 @@
|
||||
|
||||
# Global definitions
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires %{wx_requires}
|
||||
%define soname 7
|
||||
%define boinc_dir %{_localstatedir}/lib/boinc
|
||||
Name: boinc-client
|
||||
Version: 7.2.42
|
||||
Version: 7.6.32
|
||||
Release: 0
|
||||
Summary: The BOINC client
|
||||
License: GPL-3.0+ or LGPL-3.0+
|
||||
Group: Productivity/Clustering/Computing
|
||||
Url: http://boinc.berkeley.edu/
|
||||
# There is no real tarball, hence I did
|
||||
#
|
||||
# git clone git://boinc.berkeley.edu/boinc.git
|
||||
# git checkout master
|
||||
# git checkout -t client_release/7.2/7.2.42
|
||||
#
|
||||
# then I created an archive via git
|
||||
#
|
||||
# git archive -v --format=tar --prefix=boinc-7.2.42/ \
|
||||
# client_release/7.2/7.2.42 | bzip2 >../boinc-7.2.42.tar.bz2
|
||||
Source0: boinc-%{version}.tar.bz2
|
||||
|
||||
#Git-Clone: git://github.com/BOINC/boinc
|
||||
Source: https://github.com/BOINC/boinc/archive/client_release/7.6/%version.tar.gz
|
||||
Source1: boinc-icons.tar.bz2
|
||||
Source2: boinc-gui.desktop
|
||||
Source3: README.SUSE
|
||||
Source4: sysconfig.%{name}
|
||||
Source5: boinc-logrotate
|
||||
Source6: boinc-manager
|
||||
# The source for this package was pulled from upstream's vcs. Use the
|
||||
# following commands to generate the tarball:
|
||||
#
|
||||
# ./generate-tarball.sh boinc_core_release_VERSION
|
||||
#
|
||||
# Trim all binaries and other unnecessary things.
|
||||
Source8: generate-tarball.sh
|
||||
Source20: %{name}.service
|
||||
Source100: %{name}-rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE boinc-guirpcauth.patch
|
||||
@ -61,16 +46,8 @@ Source100: %{name}-rpmlintrc
|
||||
# This won't be probably upstreamed as it might be unsafe for common usage
|
||||
# without setting proper group ownership of the password file.
|
||||
Patch0: boinc-guirpcauth.patch
|
||||
# PATCH-FIX-OPENSUSE boinc-LC_MESSAGES.patch
|
||||
Patch2: boinc-LC_MESSAGES.patch
|
||||
# PATCH-FIX-OPENSUSE boinc-docbook2x.patch
|
||||
Patch4: boinc-docbook2x.patch
|
||||
# PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL
|
||||
Patch7: %{name}-AM_CONDITIONAL.patch
|
||||
# PATCH-FIX-OPENSUSE computersalat - error:
|
||||
# configure.ac:898: required file `test/version.inc.in' not found
|
||||
# configure.ac:898: required file `py/Boinc/version.py.in' not found
|
||||
Patch8: boinc-configure.patch
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: docbook2x
|
||||
BuildRequires: docbook_4
|
||||
@ -84,21 +61,14 @@ BuildRequires: libjpeg-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python-mysql
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: wxWidgets-devel >= 2.8.0
|
||||
BuildRequires: wxWidgets-3_0-devel >= 3.0.2
|
||||
BuildRequires: xorg-x11-libXmu-devel
|
||||
### FIXME:
|
||||
## updating boinc-client or boinc-manager does not update libboinc6
|
||||
## hence we define this dependency
|
||||
## !! Do not remove this dependency !!
|
||||
Requires: libboinc%{soname} = %{version}-%{release}
|
||||
Recommends: boinc-client-lang = %{version}
|
||||
Recommends: logrotate
|
||||
Requires(pre): pwdutils
|
||||
@ -146,7 +116,6 @@ in which all information and all control elements are available.
|
||||
Summary: Development files for boinc-client
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: mysql-devel
|
||||
Requires: openssl-devel
|
||||
|
||||
%description devel
|
||||
@ -172,30 +141,16 @@ BuildArch: noarch
|
||||
This package contains documentation files for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n boinc-%{version} -D -a 1
|
||||
%setup -q -n %{name}_release-7.6-%{version} -D -a 1
|
||||
%patch0
|
||||
%patch2
|
||||
%patch4
|
||||
%patch7
|
||||
%patch8
|
||||
|
||||
%build
|
||||
# Install user hints
|
||||
install -m0644 %{SOURCE3} README.SUSE
|
||||
|
||||
# Fix lang directories (refer patch2)
|
||||
mv locale/pt_PT locale/pt
|
||||
mv locale/sv_SE locale/sv
|
||||
|
||||
# fix warning: deprecated conversion from string constant to 'char*'
|
||||
pushd clientgui/common/
|
||||
sed -i 's/static char/static const char/g' wxFlatNotebookImages.h
|
||||
popd
|
||||
pushd clientgui/res/
|
||||
sed -i 's/static char/static const char/g' *.xpm
|
||||
popd
|
||||
pushd clientgui/res/skins/default/graphic/
|
||||
sed -i 's/static char/static const char/g' *.xpm
|
||||
popd
|
||||
|
||||
# fix utf8
|
||||
iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8
|
||||
@ -214,20 +169,15 @@ mv checkin_notes_2010.utf8 checkin_notes_2010
|
||||
chmod 644 clientgui/{DlgItemProperties.h,AsyncRPC.cpp,DlgItemProperties.cpp}
|
||||
sed -i 's/\r//' clientgui/DlgItemProperties.cpp
|
||||
|
||||
### bnc#745656
|
||||
## remove files with questionable licenses
|
||||
# removing NVIDIA owned file that does not clearly allow redistribution or
|
||||
# modification
|
||||
rm coprocs/NVIDIA/include/nvapi.h
|
||||
# removing unnecessary APSL licensed files
|
||||
rm client/app_stats_mac.cpp
|
||||
|
||||
%build
|
||||
#remove run libtoolize and ./_autosetup
|
||||
%{_bindir}/libtoolize --force
|
||||
./_autosetup
|
||||
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
--enable-optimize \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--enable-dynamic-client-linkage \
|
||||
--disable-server \
|
||||
@ -247,22 +197,6 @@ make libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \
|
||||
CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \
|
||||
DESTDIR=%{_prefix} %{?_smp_mflags}
|
||||
|
||||
### hmm, boincmgr is not build by default (but stated in configure)
|
||||
# BOINC Default enable values
|
||||
# --enable-server --enable-client --enable-libraries
|
||||
# --enable-manager: builds server, client, and libraries
|
||||
#
|
||||
# hence we jump into clientgui and build it manually
|
||||
pushd clientgui
|
||||
make libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \
|
||||
CFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT -lgtk-x11-2.0" \
|
||||
CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT -lgtk-x11-2.0" \
|
||||
DESTDIR=%{_prefix} %{?_smp_mflags}
|
||||
popd
|
||||
pushd locale
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
for i in clientgui locale; do
|
||||
@ -322,11 +256,6 @@ install -Dm0644 boinc-gui-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/app
|
||||
install -Dm0644 boinc-gui-22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/boinc-gui.png
|
||||
install -Dm0644 boinc-gui-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boinc-gui.png
|
||||
|
||||
# install icons
|
||||
install -m0644 clientgui/res/boincmgr.16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boincmanager.png
|
||||
install -m0644 clientgui/res/boincmgr.32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boincmanager.png
|
||||
install -m0644 clientgui/res/boincmgr.48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boincmanager.png
|
||||
|
||||
# Install *.desktop File
|
||||
%suse_update_desktop_file -i boinc-gui Utility
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -968,7 +968,6 @@ AC_CONFIG_FILES([
|
||||
lib/Makefile
|
||||
locale/Makefile
|
||||
Makefile
|
||||
- py/Boinc/version.py
|
||||
py/Makefile
|
||||
py/boinc_path_config.py:py/boinc_path_config.py.in
|
||||
py/setup.py
|
||||
@@ -990,7 +989,6 @@ AC_CONFIG_FILES([
|
||||
packages/solaris/CSW/boincmanager/prototype
|
||||
test/boinc_path_config.py:py/boinc_path_config.py.in
|
||||
test/Makefile
|
||||
- test/version.inc
|
||||
tools/boinc_path_config.py:py/boinc_path_config.py.in
|
||||
tools/Makefile
|
||||
vda/Makefile
|
||||
@ -2,7 +2,7 @@ Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -297,7 +297,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`])
|
||||
@@ -333,7 +333,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
|
||||
dnl the manpages only if docbook2x-man is available.
|
||||
|
||||
@ -2,7 +2,7 @@ Index: client/gui_rpc_server.cpp
|
||||
===================================================================
|
||||
--- client/gui_rpc_server.cpp.orig
|
||||
+++ client/gui_rpc_server.cpp
|
||||
@@ -169,12 +169,7 @@ void GUI_RPC_CONN_SET::get_password() {
|
||||
@@ -175,12 +175,7 @@ void GUI_RPC_CONN_SET::get_password() {
|
||||
// they can cause code to execute as this user.
|
||||
// So better protect it.
|
||||
//
|
||||
|
||||
@ -7,4 +7,4 @@ if ! test -f ~/gui_rpc_auth.cfg ; then
|
||||
ln -s @boinc_dir@/gui_rpc_auth.cfg ~/.
|
||||
fi
|
||||
|
||||
exec boinc-gui -e @bindir@
|
||||
exec boinc-gui -d @boinc_dir@
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
VERSION=$1
|
||||
|
||||
svn co http://boinc.berkeley.edu/svn/tags/boinc_core_release_$VERSION boinc_core_release_$VERSION
|
||||
if [ -z $1 ]; then
|
||||
echo "No path specified: use \"trim [PATH_TO_SOURCE_TOP_DIR]\"";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
# remove all binaries and other unnecessary things
|
||||
|
||||
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"
|
||||
|
||||
for DIR in $DIRS; do
|
||||
/bin/rm -rf $1/$DIR;
|
||||
echo $1/$DIR;
|
||||
done
|
||||
|
||||
echo "Trimming wxWidgets translations..."
|
||||
|
||||
# remove wxWidgets translations
|
||||
find $1/locale -name wxstd.mo -delete
|
||||
|
||||
echo "Done."
|
||||
|
||||
tar -cvjf boinc_core_release-$VERSION.tar.bz2 boinc_core_release_$VERSION --exclude=.svn
|
||||
Loading…
Reference in New Issue
Block a user