- release 5 (C++ rebuild)

[packages/flac.git] / flac.spec

diff --git a/flac.spec b/flac.spec
index b3f163e4b8030a7c82477e2fb013e47acbf7d554..7834f4e9e22c2e5f11ec82eca3b41ffe2a41b625 100644 (file)
--- a/flac.spec
+++ b/flac.spec
@@ -6,17 +6,19 @@
 Summary:       Free Lossless Audio Codec
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
-Version:       1.3.0
-Release:       2
+Version:       1.3.1
+Release:       5
 License:       BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:         Libraries
 Source0:       http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
-# Source0-md5: 13b5c214cee8373464d3d65dee362cdd
+# Source0-md5: b9922c9a0378c88d3e901b234f852698
+Patch0:                %{name}-opt.patch
+Patch1:                x32.patch
 URL:           http://xiph.org/flac/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.11
 # for AM_ICONV
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: libogg-devel >= 2:1.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2
@@ -40,8 +42,6 @@ License:      BSD
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libogg-devel >= 2:1.0
-# for -c++ only
-#Requires:     libstdc++-devel
 
 %description devel
 The package contains the development header files for FLAC libraries.
@@ -80,6 +80,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki FLAC++
 Group:         Development/Libraries
 Requires:      %{name}-c++ = %{version}-%{release}
 Requires:      %{name}-devel = %{version}-%{release}
+Requires:      libstdc++-devel
 
 %description c++-devel
 Header files for FLAC++ library.
@@ -115,6 +116,8 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %{__rm} m4/ogg.m4
 
@@ -134,7 +137,7 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 rm -rf doc-html
 cp -a doc/html doc-html
 # no makefiles in doc dirs
-%{__rm} doc-html/{Makefile*,images/Makefile*,images/hw/Makefile*,ru/Makefile*}
+find doc-html -name 'Makefile*' | xargs %{__rm}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -143,10 +146,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+%if %{with xmms}
 %{__rm} $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.la
 %if %{with static_libs}
 %{__rm} $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.a
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -170,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc doc-html/{*.html,images}
-%lang(ru) %doc doc-html/ru
 %attr(755,root,root) %{_libdir}/libFLAC.so
 %{_libdir}/libFLAC.la
 %{_includedir}/FLAC