- increase soversion to 3.6, as v6 3.4 is not abi compatible with 3.6

Changed files:
    v8-soname.patch -> 1.5
    v8.spec -> 1.30

diff --git a/v8-soname.patch b/v8-soname.patch
index 25e9578da48875a8ddcb798234d9dc5d8d61042c..32eac9db245c68aca2736ae263fcd187e33ec723 100644 (file)
--- a/v8-soname.patch
+++ b/v8-soname.patch
@@ -8,7 +8,7 @@
 -  if context.options['soname'] == 'on':
 -    # When building shared object with SONAME version the library name.
 -    library_name += '-' + version
-+  version = GetVersion().split('.')[0]
++  version = '.'.join(GetVersion().split('.')[:2])
  
    # Generate library SONAME if required by the build.
    if context.options['soname'] == 'on':

diff --git a/v8.spec b/v8.spec
index e43b1458fab611a7783ab22bd60a45ffc97d7e0b..dd23d06f0ba0061ef98c5bc63d5058edc7ea2faa 100644 (file)
--- a/v8.spec
+++ b/v8.spec
@@ -1,12 +1,10 @@
 # TODO
-# - we might need bigger soname than just major version, as 3.4 ande 3.6 are
-#   rather different and chrome fails to build
 # - readline not working in d8 (at least arrows)
 Summary:       JavaScript Engine by Google
 Summary(pl.UTF-8):     Silnik JavaScript firmy Google
 Name:          v8
 Version:       3.6.6.7
-Release:       4
+Release:       5
 License:       BSD
 Group:         Applications
 Source0:       http://commondatastorage.googleapis.com/chromium-browser-official/%{name}-%{version}.tar.bz2
@@ -25,7 +23,7 @@ Requires:     %{name}-libs = %{version}-%{release}
 ExclusiveArch: %{ix86} %{x8664} arm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                somajor %(v=%{version}; echo ${v%%%%.*})
+%define                sover   %(echo %{version} | cut -d. -f1-2)
 
 %description
 V8 is Google's open source JavaScript engine. V8 is written in C++ and
@@ -115,9 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}}
 
 for lib in libv8 libv8preparser; do
-       install -p ${lib}.so $RPM_BUILD_ROOT%{_libdir}/${lib}.so.%{version}
-       ln -sf ${lib}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/${lib}.so.%{somajor}
-       ln -sf ${lib}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/${lib}.so
+       install -p $lib.so $RPM_BUILD_ROOT%{_libdir}/$lib.so.%{version}
+       ln -sf $lib.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$lib.so.%{sover}
+       ln -sf $lib.so.%{version} $RPM_BUILD_ROOT%{_libdir}/$lib.so
 done
 cp -p include/*.h $RPM_BUILD_ROOT%{_includedir}
 
@@ -137,9 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libv8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libv8.so.3
+%attr(755,root,root) %ghost %{_libdir}/libv8.so.%{sover}
 %attr(755,root,root) %{_libdir}/libv8preparser.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libv8preparser.so.3
+%attr(755,root,root) %ghost %{_libdir}/libv8preparser.so.%{sover}
 
 %files devel
 %defattr(644,root,root,755)