rpms/deluge/devel deluge-use-mt-boost.patch, NONE, 1.1 deluge.spec, 1.23, 1.24

Peter Gordon (pgordon) fedora-extras-commits at redhat.com
Sat Aug 4 19:24:29 UTC 2007


Author: pgordon

Update of /cvs/extras/rpms/deluge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19846

Modified Files:
	deluge.spec 
Added Files:
	deluge-use-mt-boost.patch 
Log Message:
Rebuild against new Boost libraries.

deluge-use-mt-boost.patch:

--- NEW FILE deluge-use-mt-boost.patch ---
--- ./setup.py.old	2007-08-04 10:55:23.000000000 -0700
+++ ./setup.py	2007-08-04 11:03:52.000000000 -0700
@@ -110,10 +110,7 @@ if not OS == "win":
                      '/usr/include/python' + python_version]
 
 	if OS == "linux":
-		if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7\|BLAG release 60001\|Yellow Dog Linux release 5.0 (Phoenix)" /etc/issue')) == 0:
-			boosttype = 'nomt'
-		else:
-			boosttype = 'mt'
+		boosttype = 'mt'
 	elif OS == "freebsd":
 		boosttype = 'nomt'
 	else:


Index: deluge.spec
===================================================================
RCS file: /cvs/extras/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- deluge.spec	3 Aug 2007 18:01:03 -0000	1.23
+++ deluge.spec	4 Aug 2007 19:23:57 -0000	1.24
@@ -14,6 +14,8 @@
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
+Patch0:		%{name}-use-mt-boost.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	boost-devel
@@ -60,6 +62,7 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
+%patch0 -b .use-mt-boost
 
 
 %build
@@ -107,7 +110,9 @@
 %changelog
 * Fri Aug 03 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.3-2
 - Update License tag (GPLv2+).
-- Rebuild against new Boost libraries.
+- Rebuild against new Boost libraries, adding a patch to build against the
+  multi-threaded ("*-mt") libraries:
+  + use-mt-boost.patch
 
 * Wed Jul 25 2007 Peter Gordon <peter at thecodergeek.com> - 0.5.3-1
 - Update to new upstream release candidate (0.5.3)




More information about the fedora-extras-commits mailing list