From 3ea212b062ff3e0b0bedaca2046c847507f2ec75 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Sat, 15 Oct 2005 20:37:27 +0000 Subject: [PATCH] - link shared libs against needed other ones --- cdparanoia-III-alpha9.8.lm.patch | 22 ++++++++++++++++++++++ cdparanoia.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 cdparanoia-III-alpha9.8.lm.patch diff --git a/cdparanoia-III-alpha9.8.lm.patch b/cdparanoia-III-alpha9.8.lm.patch new file mode 100644 index 0000000..ba4e041 --- /dev/null +++ b/cdparanoia-III-alpha9.8.lm.patch @@ -0,0 +1,22 @@ +--- cdparanoia-III-alpha9.8/paranoia/Makefile.in.lr 2005-10-15 22:22:30.000000000 +0200 ++++ cdparanoia-III-alpha9.8/paranoia/Makefile.in 2005-10-15 22:23:40.000000000 +0200 +@@ -44,7 +44,7 @@ + $(RANLIB) libcdda_paranoia.a + + libcdda_paranoia.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) ++ $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface + [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 + [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + +--- cdparanoia-III-alpha9.8/interface/Makefile.in.lr 2005-10-15 22:28:13.000000000 +0200 ++++ cdparanoia-III-alpha9.8/interface/Makefile.in 1999-12-14 05:27:59.000000000 +0100 +@@ -46,7 +46,7 @@ + $(RANLIB) libcdda_interface.a + + libcdda_interface.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) ++ $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) -lm + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 + [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so + diff --git a/cdparanoia.spec b/cdparanoia.spec index aba12f5..9e6c37f 100644 --- a/cdparanoia.spec +++ b/cdparanoia.spec @@ -3,7 +3,7 @@ Name: cdparanoia Version: %{realver} -Release: 25 +Release: 26 License: GPL Group: Applications/Multimedia Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz @@ -17,6 +17,7 @@ Patch6: cdparanoia-III-alpha9.8.louder.patch Patch7: cdparanoia-III-alpha9.8.verbosity3.patch Patch8: cdparanoia-III-alpha9.8.env.patch Patch9: cdparanoia-III-alpha9.8.smalldma.patch +Patch10: cdparanoia-III-alpha9.8.lm.patch Url: http://www.xiph.org/paranoia/index.html BuildRoot: %{_tmppath}/cdparanoia-%{version}-root Requires: cdparanoia-libs = %{version}-%{release} @@ -62,6 +63,7 @@ applications which read CD Digital Audio disks. %patch7 -p1 -b .verbosity3 %patch8 -p1 -b .env %patch9 -p1 -b .smalldma +%patch10 -p1 %build rm -rf $RPM_BUILD_ROOT @@ -121,6 +123,9 @@ fi %{_libdir}/*.a %changelog +* Sat Oct 15 2005 Florian La Roche +- make sure shared libs are linked against respective other libs + * Wed Mar 16 2005 Peter Jones alpha9.8-25 - gcc4 rebuild and CFLAGS change