rpms/deluge/devel deluge-mt-boost-fix.patch, NONE, 1.1 deluge.spec, 1.65, 1.66

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22990

Modified Files:
	deluge.spec 
Added Files:
	deluge-mt-boost-fix.patch 
Log Message:
Apply compilation fix from Mamoru Tasaka

deluge-mt-boost-fix.patch:

--- NEW FILE deluge-mt-boost-fix.patch ---
--- deluge-1.0.0/setup.py.debug	2008-09-22 04:22:24.000000000 +0900
+++ deluge-1.0.0/setup.py	2008-09-26 22:44:27.000000000 +0900
@@ -145,8 +145,20 @@
         ]
 
     # Modify the libs if necessary for systems with only -mt boost libs    
+    #
+    # See rh#250802, boost threads lib does not have "single thread" variant,
+    # so here the existence of libboost_thread.so must be checked.
+    #
+    # Also the directory where libraries are installed should be able
+    # to be specified
+    #
+    libdir = os.path.join(sysconfig.PREFIX, "lib")
+    _libdir = sysconfig.get_config_vars()["LIBDIR"]
+    if _libdir:
+        libdir = _libdir
+
     if not os.path.exists(
-        os.path.join(sysconfig.PREFIX, "lib", "libboost_filesystem.so")):
+        os.path.join(libdir, "libboost_thread.so")):
         # It's likely that this system doesn't have symlinks setup
         # So add '-mt' to the libraries
         for lib in _libraries:


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- deluge.spec	23 Sep 2008 05:23:46 -0000	1.65
+++ deluge.spec	28 Sep 2008 05:17:18 -0000	1.66
@@ -14,6 +14,8 @@
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
+Patch0: 	%{name}-mt-boost-fix.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	boost-devel
@@ -59,6 +61,7 @@
 %setup -q
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
+%patch0 -p1 -b .mt-boost-fix
 
 
 %build
@@ -114,8 +117,12 @@
 
 
 %changelog
-* Mon Sep 22 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.0-1
+* Sat Sep 27 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.0-1
 - Update to new upstream release (1.0.0 Final)
+- Apply patch from Mamoru Tasaka to build against the multi-threaded Boost
+  libraries once more:
+  + mt-boost-fix.patch
+- Resolves: #464151 (About 1.0.0 build failure)
 
 * Tue Sep 16 2008 Peter Gordon <peter at thecodergeek.com> - 0.9.09-1
 - Update to new upstream release candidate (1.0.0 RC9)