up to 1.1.4; library name with minus not underscore

diff --git a/SConstruct b/SConstruct
index 2508254a3e94e3741b51a60a73869a4fa41d095b..039ee92377dde063e383e41c05cadef778632e48 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -3,15 +3,14 @@ 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')]
-test = double_conversion_sources + double_conversion_test_sources
-print(test)
 
 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++'])
+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++'))
@@ -27,14 +26,12 @@ if int(optimize):
 
 env.Append(CCFLAGS = " ".join(CCFLAGS))
 
-print double_conversion_sources
-print double_conversion_test_sources
 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'
+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)
@@ -42,6 +39,7 @@ 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)

diff --git a/double-conversion.spec b/double-conversion.spec
index c8b9f47d5e0c6c02efd2a960fd0d02c09460f13e..4df5de889da9712ad8bfbad36ff29d3198563d0b 100644 (file)
--- a/double-conversion.spec
+++ b/double-conversion.spec
@@ -7,12 +7,12 @@
 
 Summary:       Library providing binary-decimal and decimal-binary routines for IEEE doubles
 Name:          double-conversion
-Version:       1.1.1
+Version:       1.1.4
 Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       http://double-conversion.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 29b533ed4311161267bff1a9a97e2953
+# Source0-md5: 53669dba2d23e308dc512d6330852aa5
 URL:           http://code.google.com/p/double-conversion
 Source1:       SConstruct
 BuildRequires: libstdc++-devel
@@ -52,7 +52,7 @@ Static %{name} library.
 Statyczna biblioteka %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -qc
 cp -p %{SOURCE1} SConstruct
 
 %build
@@ -61,7 +61,7 @@ cp -p %{SOURCE1} SConstruct
        CXXFLAGS="%{__cxx}"
 
 # avoid file exists errors, when entering install
-rm -f libdouble_conversion.so libdouble_conversion.so.0
+rm -f libdouble-conversion.so libdouble-conversion.so.0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,17 +80,17 @@ cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README AUTHORS Changelog
-%attr(755,root,root) %{_libdir}/libdouble_conversion.so.*.*.*
-%ghost %{_libdir}/libdouble_conversion.so.0
+%attr(755,root,root) %{_libdir}/libdouble-conversion.so.*.*.*
+%ghost %{_libdir}/libdouble-conversion.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libdouble_conversion.so
+%{_libdir}/libdouble-conversion.so
 %{_includedir}/%{name}
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libdouble_conversion.a
-%{_libdir}/libdouble_conversion_pic.a
+%{_libdir}/libdouble-conversion.a
+%{_libdir}/libdouble-conversion_pic.a
 %endif