- really apply opt patch; release 3

[packages/flac.git] / flac.spec

diff --git a/flac.spec b/flac.spec
index 06815913475eb81aba16bd78dac434e7a490c324..a9f9ac66bbadf21cdc8cfe1e64e9668611afb7d5 100644 (file)
--- a/flac.spec
+++ b/flac.spec
@@ -2,29 +2,29 @@
 # Conditional build:
 %bcond_without static_libs     # don't build static library
 %bcond_without xmms            # don't build XMMS plugin
-#
+
 Summary:       Free Lossless Audio Codec
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
-Version:       1.2.1
-Release:       5
-License:       BSD (libFLAC/libFLAC++), GPL (programs and plugins)
+Version:       1.3.1
+Release:       3
+License:       BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz
-# Source0-md5: 153c8b15a54da428d1f0fadc756c22c7
-Patch0:                %{name}-without_xmms.patch
-Patch1:                %{name}-lt.patch
-Patch2:                %{name}-gcc44.patch
-URL:           http://flac.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake >= 1:1.7
+Source0:       http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
+# Source0-md5: b9922c9a0378c88d3e901b234f852698
+Patch0:                %{name}-opt.patch
+URL:           http://xiph.org/flac/
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.11
 # for AM_ICONV
 BuildRequires: gettext-devel
 BuildRequires: libogg-devel >= 2:1.0
 BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.4d-3
+BuildRequires: libtool >= 2:2
 %{?with_xmms:BuildRequires:    rpmbuild(macros) >= 1.125}
+BuildRequires: tar >= 1:1.22
 %{?with_xmms:BuildRequires:    xmms-devel >= 0.9.5.1}
+BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,8 +41,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.
@@ -81,6 +79,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.
@@ -106,7 +105,7 @@ Summary(pl.UTF-8):  Wtyczka FLAC dla XMMS
 License:       GPL v2+
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      xmms
+Requires:      xmms >= 0.9.5.1
 
 %description -n xmms-input-flac
 FLAC input plugin for XMMS.
@@ -116,11 +115,9 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 
 %prep
 %setup -q
-%{!?with_xmms:%patch0 -p1}
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
-rm m4/ogg.m4
+%{__rm} m4/ogg.m4
 
 %build
 %{__libtoolize}
@@ -129,19 +126,28 @@ rm m4/ogg.m4
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_static_libs:--disable-static}
+       --disable-silent-rules \
+       %{?with_static_libs:--enable-static} \
+       %{!?with_xmms:--disable-xmms-plugin}
 
 %{__make}
 
+rm -rf doc-html
+cp -a doc/html doc-html
+# no makefiles in doc dirs
+find doc-html -name 'Makefile*' | xargs %{__rm}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# no makefiles in doc dirs
-rm -f doc/html/{Makefile*,images/Makefile*,images/hw/Makefile*,ru/Makefile*}
-rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.la
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+%{__rm} $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,8 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING.Xiph README doc/html/{*.html,images}
-%lang(ru) %doc doc/html/ru
+%doc AUTHORS COPYING.Xiph README
 %attr(755,root,root) %{_bindir}/flac
 %attr(755,root,root) %{_bindir}/metaflac
 %attr(755,root,root) %{_libdir}/libFLAC.so.*.*.*
@@ -165,6 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc-html/{*.html,images}
 %attr(755,root,root) %{_libdir}/libFLAC.so
 %{_libdir}/libFLAC.la
 %{_includedir}/FLAC