X-Git-Url: http://git.pld-linux.org/?p=packages%2Fflac.git;a=blobdiff_plain;f=flac.spec;h=06815913475eb81aba16bd78dac434e7a490c324;hp=3b41547851f8db2a75f11f49f83cf983776f90ca;hb=1193aa4135fff2c813a5cb87d1e08aa697aafc8e;hpb=3caef61b1b7851d7da8e9a548ac95c7fd37f3ee1

diff --git a/flac.spec b/flac.spec
index 3b41547..0681591 100644
--- a/flac.spec
+++ b/flac.spec
@@ -1,4 +1,3 @@
-# TODO: separate c++
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
@@ -7,14 +6,15 @@
 Summary:	Free Lossless Audio Codec
 Summary(pl.UTF-8):	Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:		flac
-Version:	1.1.3
-Release:	1
+Version:	1.2.1
+Release:	5
 License:	BSD (libFLAC/libFLAC++), GPL (programs and plugins)
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/flac/%{name}-%{version}.tar.gz
-# Source0-md5:	b084603948b60ee338e0c29978cc580c
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-without_xmms.patch
+# 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
@@ -63,6 +63,43 @@ The package contains FLAC static libraries.
 %description static -l pl.UTF-8
 Ten pakiet zawiera biblioteki statyczne FLAC.
 
+%package c++
+Summary:	FLAC++ - C++ API for FLAC codec
+Summary(pl.UTF-8):	FLAC++ - API C++ do kodeka FLAC
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description c++
+FLAC++ - C++ API for FLAC codec.
+
+%description c++ -l pl.UTF-8
+FLAC++ - API C++ do kodeka FLAC.
+
+%package c++-devel
+Summary:	Header files for FLAC++ library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki FLAC++
+Group:		Development/Libraries
+Requires:	%{name}-c++ = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description c++-devel
+Header files for FLAC++ library.
+
+%description c++-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki FLAC++.
+
+%package c++-static
+Summary:	Static FLAC++ library
+Summary(pl.UTF-8):	Statyczna biblioteka FLAC++
+Group:		Development/Libraries
+Requires:	%{name}-c++-devel = %{version}-%{release}
+
+%description c++-static
+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
@@ -79,12 +116,15 @@ Wtyczka dla XMMS umożliwiająca odtwarzanie plików w formacie FLAC.
 
 %prep
 %setup -q
-%patch0 -p1
-%{!?with_xmms:%patch1 -p1}
+%{!?with_xmms:%patch0 -p1}
+%patch1 -p1
+%patch2 -p1
+
+rm m4/ogg.m4
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -100,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # no makefiles in doc dirs
-rm -f doc/html/{Makefile*,images/Makefile*,ru/Makefile*}
+rm -f doc/html/{Makefile*,images/Makefile*,images/hw/Makefile*,ru/Makefile*}
 rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.la
 
 %clean
@@ -109,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post   c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING.Xiph README doc/html/{*.html,images}
@@ -116,25 +159,40 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/flac
 %attr(755,root,root) %{_bindir}/metaflac
 %attr(755,root,root) %{_libdir}/libFLAC.so.*.*.*
-%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)
 %attr(755,root,root) %{_libdir}/libFLAC.so
-%attr(755,root,root) %{_libdir}/libFLAC++.so
 %{_libdir}/libFLAC.la
-%{_libdir}/libFLAC++.la
 %{_includedir}/FLAC
-%{_includedir}/FLAC++
+%{_pkgconfigdir}/flac.pc
 %{_aclocaldir}/libFLAC.m4
-%{_aclocaldir}/libFLAC++.m4
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libFLAC.a
+%endif
+
+%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)
+%attr(755,root,root) %{_libdir}/libFLAC++.so
+%{_libdir}/libFLAC++.la
+%{_includedir}/FLAC++
+%{_pkgconfigdir}/flac++.pc
+%{_aclocaldir}/libFLAC++.m4
+
+%if %{with static_libs}
+%files c++-static
+%defattr(644,root,root,755)
 %{_libdir}/libFLAC++.a
 %endif