- build fix

Changed files:
    flac-acfix.patch -> 1.1
    flac-lt.patch -> 1.1
    flac.spec -> 1.11

diff --git a/flac-acfix.patch b/flac-acfix.patch
new file mode 100644 (file)
index 0000000..c03a957
--- /dev/null
+++ b/flac-acfix.patch
@@ -0,0 +1,11 @@
+--- flac-1.0.4/configure.in.orig       Fri Sep 20 00:39:39 2002
++++ flac-1.0.4/configure.in    Sun Dec 22 02:33:13 2002
+@@ -261,7 +261,7 @@
+       fclose(output);
+       exit(0);
+ }
+-], . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
++], . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
+ AC_DEFINE_UNQUOTED(ID3LIB_MAJOR, $ID3LIB_MAJOR)
+ AC_DEFINE_UNQUOTED(ID3LIB_MINOR, $ID3LIB_MINOR)
+ AC_DEFINE_UNQUOTED(ID3LIB_PATCH, $ID3LIB_PATCH)

diff --git a/flac-lt.patch b/flac-lt.patch
new file mode 100644 (file)
index 0000000..02afc1d
--- /dev/null
+++ b/flac-lt.patch
@@ -0,0 +1,11 @@
+--- flac-1.0.4/src/libFLAC/ia32/Makefile.am.orig       Sat Jan 26 19:05:12 2002
++++ flac-1.0.4/src/libFLAC/ia32/Makefile.am    Sun Dec 22 02:58:27 2002
+@@ -21,7 +21,7 @@
+ STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
+ 
+ .nasm.lo:
+-      $(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
++      $(LIBTOOL) --mode=compile --tag NASM $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
+ 
+ noinst_LTLIBRARIES = libFLAC-asm.la
+ libFLAC_asm_la_SOURCES = \

diff --git a/flac.spec b/flac.spec
index 3d6d8ca4a89debc56cca8a740df993cd586b4255..0e283bd5e00cbdcf936528d799b9ef15a5f16aa0 100644 (file)
--- a/flac.spec
+++ b/flac.spec
@@ -1,3 +1,4 @@
+# TODO: split (c++, ogg?)
 Summary:       Free Lossless Audio Codec
 Summary(pl):   Free Lossless Audio Codec - Darmowy Bezstratny Kodek Audio
 Name:          flac
@@ -6,10 +7,14 @@ Release:      1
 License:       GPL/LGPL
 Group:         Libraries
 Source0:       http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:                %{name}-acfix.patch
+Patch1:                %{name}-lt.patch
 URL:           http://flac.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libogg-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.4d
 BuildRequires: xmms-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -24,15 +29,15 @@ przez Josha Coalsona.
 
 %package devel
 Summary:       FLAC - development files
-Summary(pl):   FLAC - bilbioteki rozwojowe
+Summary(pl):   FLAC - pliki nag³ówkowe
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 
 %description devel
-Package contains the development header files for flac.
+The package contains the development header files for flac.
 
 %description devel -l pl
-Paczka zawiera pliki nag³ówkowe flac.
+Ten pakiet zawiera pliki nag³ówkowe biblioteki flac.
 
 %package static
 Summary:       FLAC - static libraries
@@ -41,10 +46,10 @@ Group:              Development/Libraries
 Requires:      %{name}-devel = %{version}
 
 %description static
-Package contains flac static libraries.
+The package contains flac static libraries.
 
 %description static -l pl
-Paczka zawiera biblioteki statyczne flac.
+Ten pakiet zawiera biblioteki statyczne flac.
 
 %package -n xmms-input-flac
 Summary:       Free Lossless Audio Codec - XMMS plugin
@@ -58,10 +63,12 @@ Requires:   xmms
 FLAC input plugin for XMMS.
 
 %description -n xmms-input-flac -l pl
-Wtyczka umo¿liwiaj±ca odtwarzanie plików w formacie FLAC.
+Wtyczka dla XMMS umo¿liwiaj±ca odtwarzanie plików w formacie FLAC.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
@@ -104,4 +111,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n xmms-input-flac
 %defattr(644,root,root,755)
-%{_xmms_input_path}/*
+%attr(755,root,root) %{_xmms_input_path}/*.so
+%{_xmms_input_path}/*.la