jengelh/boinc-client
SHA256
1
0
Fork 0
forked from pool/boinc-client
Code Pull Requests Activity

Accepting request 127525 from home:computersalat:devel:network

Browse Source 
fix build for SLE_11

OBS-URL: https://build.opensuse.org/request/show/127525
OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=28
This commit is contained in:
Christian Wittmer 2012-07-10 14:19:44 +00:00 committed by Git OBS Bridge
parent 7b6209673e
commit 7e1306d5c3
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fix-automake-conditional.patch → boinc-client-AM_CONDITIONAL.patch
View File

@ -1,7 +1,7 @@
Index: boinc_core_release_6_12_43/configure.ac Index: configure.ac
=================================================================== ===================================================================
--- boinc_core_release_6_12_43.orig/configure.ac 2012-07-10 13:47:58.000000000 +0200 --- configure.ac.orig
+++ boinc_core_release_6_12_43/configure.ac 2012-07-10 14:11:55.043582540 +0200 +++ configure.ac
@@ -39,6 +39,7 @@ AC_PROG_CC @@ -39,6 +39,7 @@ AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_F77 AC_PROG_F77
@ -19,10 +19,10 @@ Index: boinc_core_release_6_12_43/configure.ac
dnl ====================================================================== dnl ======================================================================
dnl some more vodoo required for building portable client-binary (client, clientgui) dnl some more vodoo required for building portable client-binary (client, clientgui)
dnl ====================================================================== dnl ======================================================================
Index: boinc_core_release_6_12_43/clientgui/Makefile.am Index: clientgui/Makefile.am
=================================================================== ===================================================================
--- boinc_core_release_6_12_43.orig/clientgui/Makefile.am 2012-02-02 00:02:32.000000000 +0100 --- clientgui/Makefile.am.orig
+++ boinc_core_release_6_12_43/clientgui/Makefile.am 2012-07-10 14:14:26.374552322 +0200 +++ clientgui/Makefile.am
@@ -118,9 +118,8 @@ EXTRA_DIST = *.h \ @@ -118,9 +118,8 @@ EXTRA_DIST = *.h \
../lib/error_numbers.h \ ../lib/error_numbers.h \
locale $(mac_headers) locale $(mac_headers)

8
boinc-client.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 10 13:50:30 UTC 2012 - chris@computersalat.de
- rename patch
* fix-automake-conditional to boinc-client-AM_CONDITIONAL patch
- fix build for SLE_11
* AM_CONDITIONAL patch >= 12.2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 10 12:24:13 UTC 2012 - coolo@suse.com Tue Jul 10 12:24:13 UTC 2012 - coolo@suse.com

5
boinc-client.spec
View File

@ -68,7 +68,8 @@ Patch4: boinc-docbook2x.patch
Patch5: boinc-client-dynamic_buffers.patch Patch5: boinc-client-dynamic_buffers.patch
# PATCH-FIX-OPENSUSE computersalat - #error "Only <glib.h> can be included directly. # PATCH-FIX-OPENSUSE computersalat - #error "Only <glib.h> can be included directly.
Patch6: %{name}-glib_h.patch Patch6: %{name}-glib_h.patch
Patch7: fix-automake-conditional.patch # PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL
Patch7: %{name}-AM_CONDITIONAL.patch
# #
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -190,8 +191,8 @@ This package contains documentation files for %{name}.
%patch5 %patch5
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
%patch6 %patch6
%patch7
%endif %endif
%patch7 -p1
# Install user hints # Install user hints
%{__install} -m0644 %{S:3} README.SUSE %{__install} -m0644 %{S:3} README.SUSE