up to 1.1.5, SConstruct merged upstream http://code.google.com/p/double-conversion...

diff --git a/SConstruct b/SConstruct
deleted file mode 100644 (file)
index 039ee92..0000000
--- a/SConstruct
+++ /dev/null
@@ -1,47 +0,0 @@
-# vim:ft=python
-import os
-
-double_conversion_sources = ['src/' + x for x in SConscript('src/SConscript')]
-double_conversion_test_sources = ['test/cctest/' + x for x in SConscript('test/cctest/SConscript')]
-
-DESTDIR = ARGUMENTS.get('DESTDIR', '')
-prefix = ARGUMENTS.get('prefix', '/usr/local')
-lib = ARGUMENTS.get('libsuffix', 'lib')
-libdir = os.path.join(DESTDIR + prefix, lib)
-
-env = Environment(CPPPATH='#/src', LIBS=['m', 'stdc++'],
-    CXXFLAGS=ARGUMENTS.get('CXXFLAGS', ''))
-debug = ARGUMENTS.get('debug', 0)
-optimize = ARGUMENTS.get('optimize', 0)
-env.Replace(CXX = ARGUMENTS.get('CXX', 'g++'))
-
-# for shared lib, requires scons 2.3.0
-env['SHLIBVERSION'] = '0.0.0'
-
-CCFLAGS = []
-if int(debug):
-  CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-g -Wall -Werror'))
-if int(optimize):
-  CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-O3'))
-
-env.Append(CCFLAGS = " ".join(CCFLAGS))
-
-double_conversion_shared_objects = [
-    env.SharedObject(src) for src in double_conversion_sources]
-double_conversion_static_objects = [
-    env.StaticObject(src) for src in double_conversion_sources]
-
-library_name = 'double-conversion'
-
-static_lib = env.StaticLibrary(library_name, double_conversion_static_objects)
-static_lib_pic = env.StaticLibrary(library_name + '_pic', double_conversion_shared_objects)
-shared_lib = env.SharedLibrary(library_name, double_conversion_shared_objects)
-
-env.Program('run_tests', double_conversion_test_sources, LIBS=[static_lib])
-
-# InstallVersionedLib, requires scons 2.3.0
-env.InstallVersionedLib(libdir, shared_lib)
-env.Install(libdir, static_lib)
-env.Install(libdir, static_lib_pic)
-
-env.Alias('install', libdir)

diff --git a/double-conversion.spec b/double-conversion.spec
index 4df5de889da9712ad8bfbad36ff29d3198563d0b..104ca68fd620128b8a3df9c32f0955c48c7263fd 100644 (file)
--- a/double-conversion.spec
+++ b/double-conversion.spec
@@ -7,14 +7,13 @@
 
 Summary:       Library providing binary-decimal and decimal-binary routines for IEEE doubles
 Name:          double-conversion
-Version:       1.1.4
+Version:       1.1.5
 Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       http://double-conversion.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 53669dba2d23e308dc512d6330852aa5
+# Source0-md5: bf019021765fa346f85e46c6abf7c945
 URL:           http://code.google.com/p/double-conversion
-Source1:       SConstruct
 BuildRequires: libstdc++-devel
 BuildRequires: scons >= 2.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,7 +52,6 @@ Statyczna biblioteka %{name}.
 
 %prep
 %setup -qc
-cp -p %{SOURCE1} SConstruct
 
 %build
 %scons \