X-Git-Url: http://git.pld-linux.org/?p=packages%2Fflac.git;a=blobdiff_plain;f=flac.spec;h=000140161726454b72c82f49871536ecc10f7ffe;hp=779086d564eda37a294f72edb8faf9e6830077ac;hb=0dffde7e18c8560872b687d7b321fef411087a11;hpb=ef4d7dd54510745130bd9e76d153468e4195ea86

diff --git a/flac.spec b/flac.spec
index 779086d..0001401 100644
--- a/flac.spec
+++ b/flac.spec
@@ -2,27 +2,30 @@
 # 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.0
-Release:	1
-License:	BSD (libFLAC/libFLAC++), GPL (programs and plugins)
+Version:	1.3.1
+Release:	6
+License:	BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz
-# Source0-md5:	ea176bfb291707b46a537b091c226ae7
-Patch0:		%{name}-without_xmms.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
+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: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
@@ -39,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.
@@ -79,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.
@@ -104,7 +106,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.
@@ -114,28 +116,42 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 
 %prep
 %setup -q
-%{!?with_xmms:%patch0 -p1}
+%patch0 -p1
+%patch1 -p1
+
+%{__rm} m4/ogg.m4
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__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*,ru/Makefile*}
-rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.la
+%{__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
@@ -148,16 +164,17 @@ 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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libFLAC.so.8
 %{_mandir}/man1/flac.1*
 %{_mandir}/man1/metaflac.1*
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc-html/{*.html,images}
 %attr(755,root,root) %{_libdir}/libFLAC.so
 %{_libdir}/libFLAC.la
 %{_includedir}/FLAC
@@ -173,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libFLAC++.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libFLAC++.so.6
 
 %files c++-devel
 %defattr(644,root,root,755)