[ode] Fix ode-double soname not version tracking the ode soname (rhbz#922812)
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Mar 18 16:15:02 UTC 2013
commit 387e489c111e13b2522af2e734309f7e188e0208
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Mar 18 17:18:21 2013 +0100
Fix ode-double soname not version tracking the ode soname (rhbz#922812)
ode.spec | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/ode.spec b/ode.spec
index ab183f0..42e691c 100644
--- a/ode.spec
+++ b/ode.spec
@@ -1,6 +1,8 @@
+%global somajor 3
+
Name: ode
Version: 0.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: High performance library for simulating rigid body dynamics
Group: System Environment/Libraries
License: BSD or LGPLv2+
@@ -11,7 +13,6 @@ Source0: http://downloads.sourceforge.net/opende/ode-%{version}.tar.bz2
# on which the code will run
Patch0: ode-0.10.0-no-pentium-on-i386.patch
Patch1: ode-0.11.1-multilib.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libGL-devel libGLU-devel
%description
@@ -52,16 +53,18 @@ touch -r CHANGELOG.txt configure.in
# stop rpmlint from complaining about executable files in the debug package
chmod -x include/ode/collision_trimesh.h \
include/ode/odeconfig.h
+# allow overriding EXTRA_LIBTOOL_LDFLAGS from the make cmdline
+sed -i 's/libode_la_LDFLAGS = @EXTRA_LIBTOOL_LDFLAGS@/libode_la_LDFLAGS = $(EXTRA_LIBTOOL_LDFLAGS)/' \
+ ode/src/Makefile.in
%build
%configure --enable-shared --disable-static --enable-double-precision
-make %{?_smp_mflags} X_LIBS=-lX11 \
- libode_la_LDFLAGS="-release double -version-info 2:1:1"
+make %{?_smp_mflags} X_LIBS=-lX11 EXTRA_LIBTOOL_LDFLAGS="-release double"
sed -i 's|-lode|-lode-double|g' ode-config ode.pc
mv ode-config ode-double-config
mv ode.pc ode-double.pc
-mv ode/src/.libs/libode-double.so.1.1.1 .
+mv ode/src/.libs/libode-double.so.%{somajor}.?.? .
make distclean
CFLAGS="%{optflags} -ffast-math"
@@ -71,21 +74,16 @@ make %{?_smp_mflags} X_LIBS=-lX11
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libode.la
# DIY libode-double install
install -m 755 ode-double-config $RPM_BUILD_ROOT%{_bindir}
-install -m 755 libode-double.so.1.1.1 $RPM_BUILD_ROOT%{_libdir}
-ln -s libode-double.so.1.1.1 $RPM_BUILD_ROOT%{_libdir}/libode-double.so.1
-ln -s libode-double.so.1.1.1 $RPM_BUILD_ROOT%{_libdir}/libode-double.so
+install -m 755 libode-double.so.%{somajor}.?.? $RPM_BUILD_ROOT%{_libdir}
+ln -s libode-double.so.%{somajor}.?.? $RPM_BUILD_ROOT%{_libdir}/libode-double.so.%{somajor}
+ln -s libode-double.so.%{somajor}.?.? $RPM_BUILD_ROOT%{_libdir}/libode-double.so
install -m 644 ode-double.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -96,17 +94,14 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc CHANGELOG.txt LICENSE*.TXT README.txt
-%{_libdir}/libode.so.3*
+%{_libdir}/libode.so.%{somajor}*
%files double
-%defattr(-,root,root,-)
%doc CHANGELOG.txt LICENSE*.TXT README.txt
-%{_libdir}/libode-double.so.1*
+%{_libdir}/libode-double.so.%{somajor}*
%files devel
-%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_bindir}/%{name}-double-config
%{_includedir}/%{name}
@@ -117,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Mar 18 2013 Hans de Goede <hdegoede at redhat.com> - 0.12-3
+- Fix ode-double soname not version tracking the ode soname (rhbz#922812)
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list