Author: rdieter Update of /cvs/free/rpms/mlt/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10518 Modified Files: .cvsignore mlt.spec sources Log Message: sync w/devel Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mlt/F-16/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Jul 2011 23:07:40 -0000 1.8 +++ .cvsignore 15 Nov 2011 21:21:59 -0000 1.9 @@ -1 +1 @@ -mlt-0.7.4.tar.gz +mlt-0.7.6.tar.gz Index: mlt.spec =================================================================== RCS file: /cvs/free/rpms/mlt/F-16/mlt.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mlt.spec 26 Sep 2011 19:57:25 -0000 1.14 +++ mlt.spec 15 Nov 2011 21:22:03 -0000 1.15 @@ -8,7 +8,7 @@ Summary: Toolkit for broadcasters, video editors, media players, transcoders Name: mlt -Version: 0.7.4 +Version: 0.7.6 Release: 2%{?dist} License: GPLv2+ and LGPLv2+ @@ -19,7 +19,7 @@ BuildRequires: frei0r-devel BuildRequires: ffmpeg-devel -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: libquicktime-devel BuildRequires: SDL-devel BuildRequires: gtk2-devel @@ -52,21 +52,21 @@ License: LGPLv2+ Group: Development/Libraries Requires: pkgconfig -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %package python Requires: python -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Python package to work with MLT %package ruby Requires: ruby(abi) = 1.8 -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{_isa} = %{version}-%{release} Summary: Ruby package to work with MLT %package php Requires: php -Requires: %{name} = %{version}-%{release} +Requires: %{name}%[?_isa} = %{version}-%{release} Summary: PHP package to work with MLT %description devel @@ -119,68 +119,79 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -install -d $RPM_BUILD_ROOT%{python_sitelib} -install -d $RPM_BUILD_ROOT%{python_sitearch} -install -d $RPM_BUILD_ROOT%{ruby_sitelib} -install -d $RPM_BUILD_ROOT%{ruby_sitearch} -install -d $RPM_BUILD_ROOT%{php_extdir} -install -pm 0644 src/swig/python/%{name}.py $RPM_BUILD_ROOT%{python_sitelib}/ -install -pm 0755 src/swig/ruby/play.rb $RPM_BUILD_ROOT%{ruby_sitelib}/ -install -pm 0755 src/swig/ruby/thumbs.rb $RPM_BUILD_ROOT%{ruby_sitelib}/ -install -pm 0755 src/swig/ruby/%{name}.so $RPM_BUILD_ROOT%{ruby_sitearch}/ -install -pm 0755 src/swig/python/_%{name}.so $RPM_BUILD_ROOT%{python_sitearch}/ -install -pm 0755 src/swig/php/%{name}.so $RPM_BUILD_ROOT%{php_extdir}/ + +# manually do what 'make install' skips +install -D -pm 0644 src/swig/python/mlt.py $RPM_BUILD_ROOT%{python_sitelib}/mlt.py +install -D -pm 0755 src/swig/ruby/play.rb $RPM_BUILD_ROOT%{ruby_sitelib}/play.rb +install -D -pm 0755 src/swig/ruby/thumbs.rb $RPM_BUILD_ROOT%{ruby_sitelib}/thumbs.rb +install -D -pm 0755 src/swig/ruby/mlt.so $RPM_BUILD_ROOT%{ruby_sitearch}/mlt.so +install -D -pm 0755 src/swig/python/_mlt.so $RPM_BUILD_ROOT%{python_sitearch}/_mlt.so +install -D -pm 0755 src/swig/php/mlt.so $RPM_BUILD_ROOT%{php_extdir}/mlt.so mv src/modules/motion_est/README README.motion_est + +%check +# verify pkg-config version sanity +export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig +test "$(pkg-config --modversion mlt-framework)" = "%{version}" +test "$(pkg-config --modversion mlt++)" = "%{version}" + + %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig - - %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING GPL NEWS README* -%{_bindir}/%{name}-melt -%{_libdir}/%{name} -%{_libdir}/*.so.* -%{_datadir}/%{name} - +%{_bindir}/mlt-melt +%{_libdir}/mlt/ +%{_libdir}/libmlt++.so.%{version} +%{_libdir}/libmlt++.so.3* +%{_libdir}/libmlt.so.%{version} +%{_libdir}/libmlt.so.4* +%{_datadir}/mlt/ %files python %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING GPL NEWS README* -%{python_sitelib}/%{name}.py -%{python_sitelib}/%{name}.pyc -%{python_sitelib}/%{name}.pyo -%{python_sitearch}/_%{name}.so +%{python_sitelib}/mlt.py* +%{python_sitearch}/_mlt.so %files ruby %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING GPL NEWS README* %{ruby_sitelib}/play.rb %{ruby_sitelib}/thumbs.rb -%{ruby_sitearch}/%{name}.so +%{ruby_sitearch}/mlt.so %files php %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING GPL NEWS README* -%{php_extdir}/%{name}.so +%{php_extdir}/mlt.so %files devel %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING GPL NEWS README* docs/* demo -%{_libdir}/pkgconfig/* -%{_libdir}/*.so -%{_includedir}/* +%doc docs/* demo/ +%{_libdir}/pkgconfig/mlt-framework.pc +%{_libdir}/pkgconfig/mlt++.pc +%{_libdir}/libmlt.so +%{_libdir}/libmlt++.so +%{_includedir}/mlt/ +%{_includedir}/mlt++/ %changelog +* Tue Nov 15 2011 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.7.6-2 +- rebuild + +* Fri Nov 11 2011 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.7.6-1 +- 0.7.6 +- track files/sonames closer +- tighten subpkg deps via %%{?_isa} +- drop dup'd %%doc items + * Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.7.4-2 - Rebuilt for ffmpeg-0.8 Index: sources =================================================================== RCS file: /cvs/free/rpms/mlt/F-16/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 21 Jul 2011 23:07:40 -0000 1.9 +++ sources 15 Nov 2011 21:22:03 -0000 1.10 @@ -1 +1 @@ -d5d1ff686f51131a02b0f6fca0f073da mlt-0.7.4.tar.gz +105969a63339da2f8ce4ddce1652c9e7 mlt-0.7.6.tar.gz