rpms/xmms-flac/devel flac-1.1.2-libtool.patch, NONE, 1.1 xmms-flac.spec, 1.2, 1.3

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/xmms-flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20495

Modified Files:
	xmms-flac.spec 
Added Files:
	flac-1.1.2-libtool.patch 
Log Message:
Further fixes to get it to build at last.


flac-1.1.2-libtool.patch:

--- NEW FILE flac-1.1.2-libtool.patch ---
--- flac-1.1.2/src/libFLAC/Makefile.am.moo	2005-03-28 14:40:52.665468000 -0500
+++ flac-1.1.2/src/libFLAC/Makefile.am	2005-03-28 14:41:40.414671000 -0500
@@ -64,7 +64,7 @@
 libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
 endif
 endif
-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+#LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
 endif
 endif
 
--- flac-1.1.2/configure.in.moo	2005-03-28 14:48:06.733965000 -0500
+++ flac-1.1.2/configure.in	2005-03-28 14:48:25.641039000 -0500
@@ -200,9 +200,9 @@
 if test x$debug = xtrue; then
 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
 else
-	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
+	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
 	if test x$GCC = xyes; then
-		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -Winline -DFLaC__INLINE=__inline__"
 	fi
 fi
 CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/xmms-flac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmms-flac.spec	19 May 2005 09:31:53 -0000	1.2
+++ xmms-flac.spec	28 May 2005 12:32:02 -0000	1.3
@@ -3,14 +3,16 @@
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
 Version: 1.1.2
-Release: 2
+Release: 24
 License: GPL
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
 Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
-Patch: flac-1.1.2-xmms.patch
+Patch0: flac-1.1.2-xmms.patch
+Patch1: flac-1.1.2-libtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xmms-devel, glib-devel, gtk+-devel
+BuildRequires: xmms-devel, libogg-devel, gettext-devel
+Buildrequires: autoconf, automake, libtool
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -20,11 +22,13 @@
 
 %prep
 %setup -n flac-%{version}
-%patch -p1 -b .xmms
+%patch0 -p1 -b .xmms
+%patch1 -p1 -b .libtool
+autoreconf -i -f
 
 
 %build
-%configure
+%configure --with-pic
 %{__make} %{?_smp_mflags}
 
 
@@ -45,6 +49,10 @@
 
 
 %changelog
+* Sat May 28 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-24
+- Bump release to 24 since main Core flac obsoletes xmms-flac < 1.1.2-24.
+- Add patches from FC flac to fix libtool issues on x86_64.
+
 * Thu May 19 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-2
 - Add patch to fix memory double freeing issue (bz #157796).