install shared lib, requires scons 2.3.0

there's some file exists errors, not sure if it's something wrong in
SConsctruct or there's hack to avoid it

diff --git a/SConstruct b/SConstruct
index d8f703504fe4918780dff37224c619f66011c44b..2508254a3e94e3741b51a60a73869a4fa41d095b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -16,6 +16,9 @@ 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'))
@@ -39,7 +42,7 @@ shared_lib = env.SharedLibrary(library_name, double_conversion_shared_objects)
 
 env.Program('run_tests', double_conversion_test_sources, LIBS=[static_lib])
 
-env.Install(libdir, shared_lib)
+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 a49948b4370ba55028191348694300c4f4fd488b..7a91556255d0a81cb0d11cff3d9618a0c5905353 100644 (file)
--- a/double-conversion.spec
+++ b/double-conversion.spec
@@ -16,7 +16,7 @@ Source0:      http://double-conversion.googlecode.com/files/%{name}-%{version}.tar.gz
 URL:           http://code.google.com/p/double-conversion
 Source1:       SConstruct
 BuildRequires: libstdc++-devel
-BuildRequires: scons
+BuildRequires: scons >= 2.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,6 +60,9 @@ cp -p %{SOURCE1} SConstruct
        CXX="%{__cxx}"
        CXXFLAGS="%{__cxx}"
 
+# avoid file exists errors, when entering install
+rm -f libdouble_conversion.so libdouble_conversion.so.0
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/%{name}}
@@ -77,10 +80,12 @@ cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README AUTHORS
-%{_libdir}/libdouble_conversion.so
+%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
 %{_includedir}/%{name}
 
 %if %{with static_libs}