[glob2] Fix glob2_SConstruct.patch

[Petr Machata]

commit f3c1b4faa7573c3221baea74a5b20787c98a79f7
Author: Petr Machata <pmachata at redhat.com>
Date:   Sun Jul 28 19:06:48 2013 +0200

    Fix glob2_SConstruct.patch
    
    - Move glob2_SConstruct.patch from side cache to GIT.  Fix apparent
      error in detection of boost_date_time.  Decouple detection of
      boost_system from detection of boost_thread.

 .gitignore             |    1 -
 glob2.spec             |    5 ++++-
 glob2_SConstruct.patch |   30 ++++++++++++++++++++++++++++++
 sources                |    1 -
 4 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e7246c..c83d7b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 glob2-0.9.4.4.tar.gz
-/glob2_SConstruct.patch
diff --git a/glob2.spec b/glob2.spec
index 593cb30..f3e910d 100644
--- a/glob2.spec
+++ b/glob2.spec
@@ -101,8 +101,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jul 27 2013 pmachata at redhat.com - 0.9.4.4-19
+* Sat Jul 27 2013 Petr Machata <pmachata at redhat.com> - 0.9.4.4-19
 - Rebuild for boost 1.54.0
+- Move glob2_SConstruct.patch from side cache to GIT.  Fix apparent
+  error in detection of boost_date_time.  Decouple detection of
+  boost_system from detection of boost_thread.
 
 * Sun Feb 24 2013 Bruno Wolff III <bruno at wolff.to> - 0.9.4.4-18
 - Remove vendor prefix from desktop file
diff --git a/glob2_SConstruct.patch b/glob2_SConstruct.patch
new file mode 100644
index 0000000..96f0528
--- /dev/null
+++ b/glob2_SConstruct.patch
@@ -0,0 +1,30 @@
+diff -up glob2-0.9.4.4/SConstruct\~ glob2-0.9.4.4/SConstruct
+--- glob2-0.9.4.4/SConstruct~	2009-08-30 21:23:30.000000000 +0200
++++ glob2-0.9.4.4/SConstruct	2013-07-28 19:05:52.979943549 +0200
+@@ -120,11 +120,22 @@ def configure(env):
+         missing.append("libboost_thread")
+     env.Append(LIBS=[boost_thread])
+ 
++    # Boost.Thread needs Boost.System DSO's.
++    boost_system = ''
++    if conf.CheckLib("boost_system"):
++	boost_system="boost_system"
++    elif conf.CheckLib("boost_system-mt"):
++	boost_system="boost_system-mt"
++    else:
++        print "Could not find libboost_system or libboost_system-mt"
++        missing.append("libboost_system")
++    env.Append(LIBS=[boost_system])
++
+     boost_date_time = ''
+     if conf.CheckLib("boost_date_time") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
+-        boost_thread="boost_thread"
++        boost_date_time="boost_date_time"
+     elif conf.CheckLib("boost_date_time-mt") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
+-        boost_thread="boost_thread-mt"
++        boost_date_time="boost_date_time-mt"
+     else:
+         print "Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp"
+         missing.append("libboost_date_time")
+
+Diff finished.  Sun Jul 28 19:06:06 2013
diff --git a/sources b/sources
index 302e978..6f35e9b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 94c527325f355a29a2807f8f18a6e6a8  glob2-0.9.4.4.tar.gz
-ae8f21c6bbebb2c290bb3e95d222859c  glob2_SConstruct.patch