rpms/boinc-client/F-12 boinc-client.spec, 1.40, 1.41 boinc-gcc44.patch, 1.3, NONE boinc-macbuild.patch, 1.1, NONE

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20212

Modified Files:
	boinc-client.spec 
Removed Files:
	boinc-gcc44.patch boinc-macbuild.patch 
Log Message:
- Rebase to 6.10 branch
- Use XZ for sources compression
- Added BR: sqlite-devel
- Dropped boinc-gcc44.patch (merged upstream)
- Dropped boinc-macbuild.patch (merged upstream)
- Fix owner/group of shared libraries




Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-12/boinc-client.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- boinc-client.spec	21 Aug 2009 12:39:13 -0000	1.40
+++ boinc-client.spec	3 Jan 2010 00:03:26 -0000	1.41
@@ -1,38 +1,32 @@
-%global revision 18632
-%global version_ 6_6a
+%global revision 20004
+%global version_ 6_10
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	6.6.37
-Release:	4.r%{revision}svn%{?dist}
+Version:	6.10.25
+Release:	1.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
 # The source for this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-# svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_}
+# svn export http://boinc.berkeley.edu/svn/branches/boinc_core_release_%{version_}
 # pushd boinc_core_release_%{version_}
 # ./_autosetup
 # ./trim . Trim all binaries and other unnecessary things.
 # popd
-# tar -cjvf boinc-%{version}.tar.bz2 boinc_core_release_%{version_}/
-Source0:	boinc-%{version}.tar.bz2
+# tar -cJvf boinc-%{version}.tar.xz boinc_core_release_%{version_}/
+Source0:	boinc-%{version}.tar.xz
 Source1:	boinc-client-init-d
 Source2:	boinc-client-logrotate-d
 Source3:	boinc-manager.desktop
 Source4:	USAGE_FEDORA
 Source8:	trim
-#Fix the gcc 4.4 at glibc2.10 build
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/854
-Patch4:		boinc-gcc44.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
-#Fix Mac build:
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/941
-Patch8:		boinc-macbuild.patch
+Patch0:		boinc-guirpcauth.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	logrotate
@@ -43,6 +37,7 @@ Requires(postun): initscripts
 Requires(pre):	shadow-utils
 
 BuildRequires:	MySQL-python
+BuildRequires:	sqlite-devel
 BuildRequires:	curl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	freeglut-devel
@@ -116,11 +111,13 @@ This package contains documentation file
 
 %prep
 %setup -q -n boinc_core_release_%{version_}
-%patch4
-%patch6
-%patch8 -p1
+%patch0
 
 # fix utf8
+iconv -f ISO88591 -t UTF8 < checkin_notes > checkin_notes.utf8
+touch -r checkin_notes checkin_notes.utf8
+mv checkin_notes.utf8 checkin_notes
+
 iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8
 touch -r checkin_notes_2004 checkin_notes_2004.utf8
 mv checkin_notes_2004.utf8 checkin_notes_2004
@@ -307,9 +304,9 @@ fi
 %{_initrddir}/%{name}
 %{_mandir}/man1/boinccmd.1.gz
 %{_mandir}/man1/boinc.1.gz
+%{_libdir}/*.so.*
 %defattr(-,boinc,boinc,-)
 %{_localstatedir}/lib/boinc/
-%{_libdir}/*.so.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -329,6 +326,7 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libboinc.a
 %{_libdir}/libboinc_api.a
+%{_libdir}/libboinc_crypt.a
 %{_libdir}/libboinc_graphics2.a
 
 %files devel
@@ -337,6 +335,14 @@ fi
 %{_includedir}/boinc
 
 %changelog
+* Tue Dec 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.10.25-1.r20004svn
+- Rebase to 6.10 branch
+- Use XZ for sources compression
+- Added BR: sqlite-devel
+- Dropped boinc-gcc44.patch (merged upstream)
+- Dropped boinc-macbuild.patch (merged upstream)
+- Fix owner/group of shared libraries
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.6.37-4.r18632svn
 - rebuilt with new openssl
 


--- boinc-gcc44.patch DELETED ---


--- boinc-macbuild.patch DELETED ---