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

diff --git a/flac.spec b/flac.spec
index 0001401..74b79d2 100644
--- a/flac.spec
+++ b/flac.spec
@@ -1,31 +1,30 @@
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static library
-%bcond_without	xmms		# don't build XMMS plugin
+%bcond_without	static_libs	# static library
 
 Summary:	Free Lossless Audio Codec
 Summary(pl.UTF-8):	Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:		flac
-Version:	1.3.1
-Release:	6
+Version:	1.4.3
+Release:	1
 License:	BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:		Libraries
-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/
+Source0:	https://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
+# Source0-md5:	7cab20b46e0bc859234bf5ba7da81625
+URL:		https://xiph.org/flac/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.11
+BuildRequires:	doxygen
 # for AM_ICONV
 BuildRequires:	gettext-tools
 BuildRequires:	libogg-devel >= 2:1.0
 BuildRequires:	libstdc++-devel
 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
+# flac 1.4.2 dropped xmms plugin; for now we build plugin in xmms-input-flac.spec from flac 1.4.1 sources.
+# Uncomment this Obsoletes in case xmms-input-flac.spec doesn't build any longer:
+#Obsoletes:	xmms-input-flac < 1.4.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -100,24 +99,8 @@ Static FLAC++ library.
 %description c++-static -l pl.UTF-8
 Statyczna biblioteka FLAC++.
 
-%package -n xmms-input-flac
-Summary:	Free Lossless Audio Codec - XMMS plugin
-Summary(pl.UTF-8):	Wtyczka FLAC dla XMMS
-License:	GPL v2+
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	xmms >= 0.9.5.1
-
-%description -n xmms-input-flac
-FLAC input plugin for XMMS.
-
-%description -n xmms-input-flac -l pl.UTF-8
-Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %{__rm} m4/ogg.m4
 
@@ -129,29 +112,18 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	%{?with_static_libs:--enable-static} \
-	%{!?with_xmms:--disable-xmms-plugin}
+	%{?with_static_libs:--enable-static}
 
 %{__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
 
-%{__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
+# packaged as %doc in -devel
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -164,17 +136,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING.Xiph README
+%doc AUTHORS CHANGELOG.md COPYING.Xiph README.md
 %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
+%attr(755,root,root) %ghost %{_libdir}/libFLAC.so.12
 %{_mandir}/man1/flac.1*
 %{_mandir}/man1/metaflac.1*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc-html/{*.html,images}
+%doc doc/api/*.{html,png} doc/images/logo*.{gif,svg}
 %attr(755,root,root) %{_libdir}/libFLAC.so
 %{_libdir}/libFLAC.la
 %{_includedir}/FLAC
@@ -190,7 +162,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
+%attr(755,root,root) %ghost %{_libdir}/libFLAC++.so.10
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -205,9 +177,3 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libFLAC++.a
 %endif
-
-%if %{with xmms}
-%files -n xmms-input-flac
-%defattr(644,root,root,755)
-%attr(755,root,root) %{xmms_input_plugindir}/libxmms-flac.so
-%endif