X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=flac.spec;h=a7f89911c169d61126bd615ceb5c0fccf90de01f;hb=61361cc35f17e7147aede982f8eef369c2b4191c;hp=48371833f0ea817272e2798713838ea2d243df7c;hpb=d8d1b025b4be63338f12d9703b8f244a0370066e;p=packages%2Fflac.git

diff --git a/flac.spec b/flac.spec
index 4837183..a7f8991 100644
--- a/flac.spec
+++ b/flac.spec
@@ -1,30 +1,29 @@
-# TODO: split (c++, ogg?)
+# maybe TODO: split (c++, ogg?)
 #
 # Conditional build:
-#  _without xmms
-Summary: 	Free Lossless Audio Codec
-Summary(pl):	Free Lossless Audio Codec - Darmowy Bezstratny Kodek Audio
+%bcond_without	xmms	# don't build XMMS plugin
+#
+Summary:	Free Lossless Audio Codec
+Summary(pl):	Free Lossless Audio Codec - Wolnodostêpny bezstratny kodek audio
 Name:		flac
-Version:	1.1.0
+Version:	1.1.1
 Release:	1
 License:	GPL/LGPL
 Group:		Libraries
-Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-lt.patch
-Patch1:		%{name}-without_xmms.patch
+Source0:	http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz
+# Source0-md5:	c6ccddccf8ad344065698047c2fc7280
+Patch0:		%{name}-without_xmms.patch
 URL:		http://flac.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libogg-devel
+%{?with_xmms:BuildRequires:	id3lib-devel >= 3.8.0}
+BuildRequires:	libogg-devel >= 2:1.0
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 1:1.4.1
-%{!?_without_xmms:BuildRequires:	xmms-devel}
+BuildRequires:	libtool >= 2:1.4d-3
+%{?with_xmms:BuildRequires:	rpmbuild(macros) >= 1.125}
+%{?with_xmms:BuildRequires:	xmms-devel >= 0.9.5.1}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{!?_without_xmms:1}0
-%define		_xmms_input_path	%(xmms-config --input-plugin-dir)
-%endif
-
 %description
 FLAC is an Open Source lossless audio codec developed by Josh Coalson.
 
@@ -36,32 +35,32 @@ przez Josha Coalsona.
 Summary:	FLAC - development files
 Summary(pl):	FLAC - pliki nag³ówkowe
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
-The package contains the development header files for flac.
+The package contains the development header files for FLAC libraries.
 
 %description devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe biblioteki flac.
+Ten pakiet zawiera pliki nag³ówkowe bibliotek FLAC.
 
 %package static
 Summary:	FLAC - static libraries
 Summary(pl):	FLAC - biblioteki statyczne
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-The package contains flac static libraries.
+The package contains FLAC static libraries.
 
 %description static -l pl
-Ten pakiet zawiera biblioteki statyczne flac.
+Ten pakiet zawiera biblioteki statyczne FLAC.
 
 %package -n xmms-input-flac
-Summary: 	Free Lossless Audio Codec - XMMS plugin
+Summary:	Free Lossless Audio Codec - XMMS plugin
 Summary(pl):	Wtyczka FLAC dla XMMS
 License:	GPL/LGPL
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	xmms
 
 %description -n xmms-input-flac
@@ -72,16 +71,15 @@ Wtyczka dla XMMS umo
 
 %prep
 %setup -q
-%patch0 -p1
-%{?_without_xmms:%patch1 -p1}
+%{!?with_xmms:%patch0 -p1}
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
+
 %{__make}
 
 %install
@@ -90,6 +88,10 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -98,9 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/html/{*.html,images/{*.gif,*.jpg}}
+%doc AUTHORS README doc/html/{*.html,images}
+%lang(ru) %doc doc/html/ru
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.* 
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_mandir}/man1/*
 
 %files devel
@@ -114,9 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%if %{!?_without_xmms:1}0
+%if %{with xmms}
 %files -n xmms-input-flac
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_xmms_input_path}/*.so
-%{_xmms_input_path}/*.la
+%attr(755,root,root) %{xmms_input_plugindir}/*.so
 %endif