- Update with work from Matthias Clasen <mclasen@redhat.com> up to upstream

1.1.3 (#229462)
- Remove xmmx-flac Obsolete, as we don't ship the xmms plugin

.cvsignore

@@ -1,2 +1,3 @@
 flac-1.1.0.tar.gz
 flac-1.1.2.tar.gz
+flac-1.1.3.tar.gz

flac-1.1.3-gnu-stack.patch

@@ -0,0 +1,30 @@
+--- flac-1.1.3/src/libFLAC/ia32/lpc_asm.nasm.gnu-stack	2006-11-10 02:51:37.000000000 -0500
++++ flac-1.1.3/src/libFLAC/ia32/lpc_asm.nasm	2007-02-01 18:43:23.000000000 -0500
+@@ -1502,6 +1502,4 @@
+ 
+ end
+ 
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1
+--- flac-1.1.3/src/libFLAC/ia32/fixed_asm.nasm.gnu-stack	2006-11-10 02:51:37.000000000 -0500
++++ flac-1.1.3/src/libFLAC/ia32/fixed_asm.nasm	2007-02-01 18:42:28.000000000 -0500
+@@ -305,6 +305,4 @@
+ 
+ end
+ 
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrwite align=1
+--- flac-1.1.3/src/libFLAC/ia32/cpu_asm.nasm.gnu-stack	2006-11-10 02:51:37.000000000 -0500
++++ flac-1.1.3/src/libFLAC/ia32/cpu_asm.nasm	2007-02-01 18:43:06.000000000 -0500
+@@ -99,6 +99,4 @@
+ 
+ end
+ 
+-%ifdef OBJ_FORMAT_elf
+-       section .note.GNU-stack noalloc
+-%endif
++section .note.GNU-stack progbits noalloc noexec nowrite align=1

flac-1.1.3-noxmms.patch

@@ -0,0 +1,29 @@
+--- flac-1.1.3/configure.in.noxmms	2006-11-20 16:29:34.000000000 -0500
++++ flac-1.1.3/configure.in	2007-02-01 19:20:39.000000000 -0500
+@@ -196,25 +196,7 @@
+ fi
+ AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
+ 
+-AC_ARG_ENABLE(local-xmms-plugin,
+-AC_HELP_STRING([--enable-local-xmms-plugin], [Install XMMS plugin to ~/.xmms/Plugins instead of system location]),
+-[case "${enableval}" in
+-	yes) install_xmms_plugin_locally=true ;;
+-	no)  install_xmms_plugin_locally=false ;;
+-	*) AC_MSG_ERROR(bad value ${enableval} for --enable-local-xmms-plugin) ;;
+-esac],[install_xmms_plugin_locally=false])
+-AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test "x$install_xmms_plugin_locally" = xtrue)
+-
+-AC_ARG_ENABLE(xmms-plugin,
+-AC_HELP_STRING([--disable-xmms-plugin], [Do not build XMMS plugin]),
+-[case "${enableval}" in
+-	yes) enable_xmms_plugin=true ;;
+-	no)  enable_xmms_plugin=false ;;
+-	*) AC_MSG_ERROR(bad value ${enableval} for --enable-xmms-plugin) ;;
+-esac],[enable_xmms_plugin=true])
+-if test "x$enable_xmms_plugin" != xfalse ; then
+-	AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - XMMS support will not be built]))
+-fi
++AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test x$install_xmms_plugin_locally = xtrue)
+ AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "$XMMS_INPUT_PLUGIN_DIR")
+ 
+ dnl check for ogg library

flac.spec

@@ -1,19 +1,18 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec.
 Name: flac
-Version: 1.1.2
-Release: 27
+Version: 1.1.3
+Release: 1%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch1: flac-1.1.2-libtool.patch
-Patch3: flac-1.1.0-gnu-stack.patch
-Patch4: flac-1.1.2-noxmms.patch
+Patch3: flac-1.1.3-gnu-stack.patch
+Patch4: flac-1.1.3-noxmms.patch
+Patch5: flac-1.1.3-link-ogg.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
 BuildRequires: libtool, gettext-devel
 Obsoletes: flac-libs
-Obsoletes: xmms-flac < 1.1.2-24
 
 %description
 FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
@@ -34,9 +33,9 @@ will use the Free Lossless Audio Codec.
 
 %prep
 %setup -q
-%patch1 -p1 -b .libtool
 %patch3 -p1 -b .gnu-stack
 %patch4 -p1 -b .noxmms
+%patch5 -p1 -b .link-ogg
 
 autoreconf -i -f
 
@@ -76,6 +75,11 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Feb 13 2007 - Bastien Nocera <bnocera@redhat.com> - 1.1.3-1
+- Update with work from Matthias Clasen <mclasen@redhat.com> up
+  to upstream 1.1.3 (#229462)
+- Remove xmmx-flac Obsolete, as we don't ship the xmms plugin
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.1.2-27
 - rebuild
 - Try building w/ glib2-devel

sources

@@ -1 +1 @@
-2bfc127cdda02834d0491ab531a20960  flac-1.1.2.tar.gz
+b084603948b60ee338e0c29978cc580c  flac-1.1.3.tar.gz