From 5222c182b755e5b8495aa6b35747e676a65e986c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mar 08 2010 11:15:56 +0000 Subject: Remove obsolete patch --- diff --git a/0001-Fix-DSO-linking.patch b/0001-Fix-DSO-linking.patch deleted file mode 100644 index 55c9077..0000000 --- a/0001-Fix-DSO-linking.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6447181296e56e20c6b504978477d24cc55655e9 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 15 Feb 2010 10:41:40 +0000 -Subject: [PATCH] Fix DSO linking - -Explicitely link against libm, to avoid linking problems: -CCLD sbc/sbctester -/usr/bin/ld: sbc/sbctester.o: undefined reference to symbol 'sqrt@@GLIBC_2.2.5' -/usr/bin/ld: note: 'sqrt@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line -/lib64/libm.so.6: could not read symbols: Invalid operation - -https://bugzilla.redhat.com/show_bug.cgi?id=564799 ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 584b921..fc7b2c0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -81,7 +81,7 @@ sbc_sbcenc_LDADD = sbc/libsbc.la - if SNDFILE - noinst_PROGRAMS += sbc/sbctester - --sbc_sbctester_LDADD = @SNDFILE_LIBS@ -+sbc_sbctester_LDADD = @SNDFILE_LIBS@ -lm - sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@ - endif - endif --- -1.6.6 - diff --git a/bluez.spec b/bluez.spec index e44ab0d..af17295 100644 --- a/bluez.spec +++ b/bluez.spec @@ -17,8 +17,6 @@ Patch1: bluez-utils-oui-usage.patch # https://bugzilla.redhat.com/show_bug.cgi?id=450081 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687 Patch2: bluez-try-utf8-harder.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=564799 -Patch3: 0001-Fix-DSO-linking.patch # https://bugzilla.redhat.com/show_bug.cgi?id=498756 Patch4: bluez-socket-mobile-cf-connection-kit.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/2396 @@ -130,7 +128,6 @@ This includes hidd, dund and pand. %setup -q %patch1 -p0 -b .oui %patch2 -p1 -b .non-utf8-name -%patch3 -p1 -b .linking %patch4 -p1 -b .socket-mobile %patch5 -p1 -b .cable-pairing