- 1.1.8, updated system-libs,libsndfile1,strip patches

Changed files:
    cinelerra.spec -> 1.12

diff --git a/cinelerra.spec b/cinelerra.spec
index 73edeff47e599d7a528550385629f97f7f5b54e3..44fcd56a9e32dafbc66eecc6cb3ff84c2b85c802 100644 (file)
--- a/cinelerra.spec
+++ b/cinelerra.spec
@@ -3,12 +3,12 @@
 Summary:       Cinelerra - capturing, editing and production of audio/video material
 Summary(pl):   Cinelerra - nagrywanie, obróbka i produkcja materia³u audio/video
 Name:          cinelerra
-Version:       1.1.7
-Release:       2
+Version:       1.1.8
+Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.bz2
-# Source0-md5: efdd895b6706da3a450d0bcf92fd5c11
+# Source0-md5: 626b39c2013bdd9bea5c14421fe2ac66
 Patch0:                %{name}-system-libs.patch
 Patch1:                %{name}-libsndfile1.patch
 Patch2:                %{name}-strip.patch
@@ -21,12 +21,19 @@ BuildRequires:      esound-devel
 BuildRequires: freetype-devel >= 2.1.4
 BuildRequires: lame-libs-devel >= 3.93.1
 BuildRequires: libavc1394-devel >= 0.4.0
-BuildRequires: libmpeg3-devel >= 1.5.0-2
-BuildRequires: libsndfile-devel >= 1.0.0
+BuildRequires: libmpeg3-devel >= 1.5.3
+BuildRequires: libsndfile-devel >= 1.0.5
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libuuid-devel
-BuildRequires: quicktime4linux-devel >= 2.0.0
+%ifarch %{ix86}
+BuildRequires: nasm
+%endif
+BuildRequires: quicktime4linux-devel >= 2.0.1
+Requires:      freetype >= 2.1.4
+Requires:      libmpeg3 >= 1.5.3
+Requires:      libsndfile >= 1.0.5
+Requires:      quicktime4linux >= 2.0.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # defaulttheme and microtheme cannot be stripped
@@ -73,8 +80,9 @@ CFLAGS="%{rpmcflags} -fno-rtti"; export CFLAGS
 %{__make} -C mplexhi
 %{__make} -C mplexlo
 %{__make} -C guicast
-%{__make} -C cinelerra
-# defaulttheme and microtheme are stripped before running "bootstrap"
+# cinelerra, defaulttheme and microtheme are stripped before running "bootstrap"
+%{__make} -C cinelerra \
+       STRIP="%{?debug:true}%{!?debug:strip -R.note -R.comment}"
 %{__make} -C plugins \
        STRIP="%{?debug:true}%{!?debug:strip -R.note -R.comment}"
 
@@ -87,7 +95,6 @@ install plugins/`uname -m`/*.plugin $RPM_BUILD_ROOT%{_libdir}/cinelerra
 
 %if 0%{!?debug:1}
 # strip all that can be stripped
-strip -R.note -R.comment $RPM_BUILD_ROOT%{_bindir}/cinelerra
 find $RPM_BUILD_ROOT%{_libdir}/cinelerra -name '*.plugin' | \
        grep -v 'defaulttheme\|microtheme' | xargs strip -R.note -R.comment
 %endif
@@ -97,6 +104,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{*.png,*.html,press}
+%doc doc/{*.png,*.html,press} cinelerra/{CHANGELOG*,TODO}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/cinelerra