- simplified build/install

Changed files:
    espeak.spec -> 1.26

diff --git a/espeak.spec b/espeak.spec
index ff7d3c860d741c605960d2a4d81a4658639cd0c7..d81edb9f7ea21d913292c002620ec7da742f2b2b 100644 (file)
--- a/espeak.spec
+++ b/espeak.spec
@@ -118,24 +118,22 @@ eSpeak - biblioteki statyczne.
 rm -f src/portaudio{18,19,}.h
 
 %build
 rm -f src/portaudio{18,19,}.h
 
 %build

-cd src
-%{__make} \
+%{__make} -C src \

        CXX="%{__cxx}" \
        CXXFLAGS="%{rpmcxxflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
        CXX="%{__cxx}" \
        CXXFLAGS="%{rpmcxxflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-cd src
-%{__make} install \
+%{__make} -C src install \

        DESTDIR=$RPM_BUILD_ROOT \
        LIBDIR="%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
        DESTDIR=$RPM_BUILD_ROOT \
        LIBDIR="%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)


@@ -271,8 +269,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)

-%{_includedir}/*

 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.so

+%{_includedir}/*

 
 %files static
 %defattr(644,root,root,755)
 
 %files static
 %defattr(644,root,root,755)