- updated to 1.6.2

- force CXXFLAGS to override -march=native

diff --git a/zita-resampler.spec b/zita-resampler.spec
index 217f76e3129fc46b0015e8b4386aadd39c85dc65..cba7924523bfd1dbd57093b1990f86dcea9b9fe2 100644 (file)
--- a/zita-resampler.spec
+++ b/zita-resampler.spec
@@ -1,23 +1,31 @@
 Summary:       C++ library for sample rate conversion of audio signals
+Summary(pl.UTF-8):     Biblioteka C++ do konwersji szybkości próbkowania sygnałów dźwiękowych
 Name:          zita-resampler
-Version:       1.6.0
+Version:       1.6.2
 Release:       1
 License:       GPL v3+
 Group:         Libraries
 Source0:       http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 7b5ddc42f210985b29c8769111217e4c
+# Source0-md5: 9b2cff7fa419febbca3a13435b2a24b3
 URL:           http://kokkinizita.linuxaudio.org/linuxaudio/
+BuildRequires: libsndfile-devel
+BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Zita-resampler is a C++ library for sample rate conversion of audio
 signals.
 
+%description -l pl.UTF-8
+Zita-resampler to biblioteka C++ do konwersji szybkości próbkowania
+sygnałów dźwiękowych.
+
 %package devel
 Summary:       Header files for %{name} library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki %{name}
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel
 
 %description devel
 Header files for %{name} library.
@@ -27,36 +35,41 @@ Pliki nagłówkowe biblioteki %{name}.
 
 %package apps
 Summary:       Example applications using the %{name} library
+Summary(pl.UTF-8):     Przykładowe aplikacje wykorzystujące bibliotekę %{name}
 Group:         Applications/Sound
 Requires:      %{name} = %{version}-%{release}
 
 %description apps
 Example applications using the %{name} library.
 
+%description apps -l pl.UTF-8
+Przykładowe aplikacje wykorzystujące bibliotekę %{name}.
+
 %prep
 %setup -q
 
 %build
-CXXFLAGS="%{rpmcxxflags}" \
 CPPFLAGS="%{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} -C libs
+%{__make} -C source \
+       CXX="%{__cxx}" \
+       CXXFLAGS="%{rpmcxxflags} -fPIC -Wall -ffast-math"
 
-ln -s "$(basename libs/libzita-resampler.so.*.*.*)" libs/libzita-resampler.so
+ln -s "$(basename source/libzita-resampler.so.*.*.*)" source/libzita-resampler.so
 
-CXXFLAGS="%{rpmcxxflags}" \
-CPPFLAGS="-I../libs %{rpmcppflags}" \
-LDFLAGS="-L../libs %{rpmldflags}" \
-%{__make} -C apps
+CPPFLAGS="-I../source %{rpmcppflags}" \
+LDFLAGS="-L../source %{rpmldflags}" \
+%{__make} -C apps \
+       CXXFLAGS="%{rpmcxxflags} -Wall -ffast-math"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir}/man1}
 
-cp -p libs/lib%{name}.so.1.* $RPM_BUILD_ROOT%{_libdir}
+cp -p source/lib%{name}.so.1.* $RPM_BUILD_ROOT%{_libdir}
 /sbin/ldconfig -nN $RPM_BUILD_ROOT%{_libdir}
-ln -s "$(basename libs/lib%{name}.so.1.*)" $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
-cp -R libs/%{name} $RPM_BUILD_ROOT%{_includedir}
+ln -s "$(basename $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.1.*)" $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
+cp -pr source/%{name} $RPM_BUILD_ROOT%{_includedir}
 
 %{__make} -C apps install \
        PREFIX="%{_prefix}" \
@@ -71,15 +84,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README
-%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.1
+%attr(755,root,root) %{_libdir}/libzita-resampler.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libzita-resampler.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}
+%attr(755,root,root) %{_libdir}/libzita-resampler.so
+%{_includedir}/zita-resampler
 
 %files apps
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*.1*
+%attr(755,root,root) %{_bindir}/zresample
+%attr(755,root,root) %{_bindir}/zretune
+%{_mandir}/man1/zresample.1*
+%{_mandir}/man1/zretune.1*