[boinc-client] update to 6.12.35

[Miloš Jakubíček]

commit b6ec0fedc464998dced09468c68a0ac593635297
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Sat Aug 20 18:49:33 2011 +0200

    update to 6.12.35

 .gitignore        |    1 +
 boinc-client.spec |   40 +++++++++++++++++++++++++++++-----------
 sources           |    2 +-
 3 files changed, 31 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea451c9..feccccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 boinc-6.10.45.tar.xz
 /boinc-6.10.58.tar.xz
+/boinc-6.12.35.tar.xz
diff --git a/boinc-client.spec b/boinc-client.spec
index f550aac..d954916 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -1,10 +1,10 @@
-%global revision 22930
-%global version_ 6_10
+%global revision 24014
+%global version_ 6_12
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	6.10.58
-Release:	3.r%{revision}svn%{?dist}
+Version:	6.12.35
+Release:	1.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -12,6 +12,7 @@ URL:		http://boinc.berkeley.edu/
 # following commands to generate the tarball:
 # svn export http://boinc.berkeley.edu/svn/branches/boinc_core_release_%{version_}
 # pushd boinc_core_release_%{version_}
+# patch < boinc-manager-Makefile.patch
 # ./_autosetup
 # ./trim . Trim all binaries and other unnecessary things.
 # popd
@@ -22,14 +23,17 @@ Source2:	boinc-client-logrotate-d
 Source3:	boinc-manager.desktop
 Source4:	USAGE_FEDORA
 Source8:	trim
+#Wrong indentation in Makefile.am breaks the build
+#Filed upstream: http://boinc.berkeley.edu/trac/ticket/1132
+Source9:	boinc-manager-Makefile.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.
 Patch0:		boinc-guirpcauth.patch
-# Upstream patch fixing BZ#620585
-# http://boinc.berkeley.edu/trac/ticket/1040
-Patch1:		boinc-gui-rpc-port.patch
+#Patch to build with libnotify 0.7
+#Filed upstream: http://boinc.berkeley.edu/trac/ticket/1131
+Patch1:		boinc-libnotify.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	logrotate
@@ -52,6 +56,8 @@ BuildRequires:	mysql-devel
 BuildRequires:	libXmu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	docbook2X
+BuildRequires:	xcb-util-devel
+BuildRequires:	libnotify-devel
 
 %description
 The Berkeley Open Infrastructure for Network Computing (BOINC) is an open-
@@ -115,7 +121,7 @@ This package contains documentation files for %{name}.
 %prep
 %setup -q -n boinc_core_release_%{version_}
 %patch0
-%patch1 -p3
+%patch1 -p1
 
 # fix utf8
 iconv -f ISO88591 -t UTF8 < checkin_notes > checkin_notes.utf8
@@ -158,9 +164,9 @@ install -p -m644 %{SOURCE4} .
 %global confflags --disable-dependency-tracking --enable-dynamic-client-linkage --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}
+CXXFLAGS=`pkg-config gtk+-x11-2.0 --cflags --libs` %configure %{confflags} --with-boinc-platform=%{boinc_platform}
 %else
-%configure %{confflags}
+CXXFLAGS=`pkg-config gtk+-x11-2.0 --cflags --libs` %configure %{confflags}
 %endif
 
 # Disable rpaths
@@ -246,6 +252,7 @@ desktop-file-install %{?_remove_encoding} --vendor fedora \
   %{SOURCE3}
 
 %find_lang BOINC-Manager
+%find_lang BOINC-Client
 
 # bash-completion
 install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
@@ -297,7 +304,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files
+%files -f BOINC-Client.lang
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/bash_completion.d/
@@ -322,6 +329,7 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/boinc_gui
 %{_bindir}/boincmgr
+%{_bindir}/boincscr
 %{_datadir}/applications/fedora-boinc-manager.desktop
 %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
 %{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
@@ -341,6 +349,16 @@ fi
 %{_includedir}/boinc
 
 %changelog
+* Fri Aug 19 2011 Miloš Jakubíček <xjakub at fi.muni.cz> - 6.12.35-1.r24014svn
+- Update to 6.12 branch (fix BZ#719875, BZ#690333)
+- Dropped boinc-gui-rpc-port.patch (merged upstream)
+- Added BR: libnotify-devel, xcb-util-devel
+- Added boinc-libnotify.patch to build with libnotify >= 0.7
+- Added boinc-manager-Makefile.patch to fix Makefile indentation error
+- Now shipping also BOINC screensaver
+- Added BOINC Client translation files
+- Fixed scheduling problems related to cgroups (BZ#705444)
+
 * Wed Feb 09 2011 Miloš Jakubíček <xjakub at fi.muni.cz> - 6.10.58-3.r22930svn
 - Add boinc-gui-rpc-port.patch, fixing BZ#620585
 
diff --git a/sources b/sources
index c0646b0..a5e79bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6a12ee327c1f4c40ad14ff513b9a4df  boinc-6.10.58.tar.xz
+97fb264717bec3ef194fde71805c4e93  boinc-6.12.35.tar.xz