Author: glen Date: Fri Dec 29 13:45:28 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - install mencoder to system bindir
---- Files affected: SPECS: flixengine.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/flixengine.spec diff -u SPECS/flixengine.spec:1.23 SPECS/flixengine.spec:1.24 --- SPECS/flixengine.spec:1.23 Fri Dec 29 10:25:16 2006 +++ SPECS/flixengine.spec Fri Dec 29 14:45:23 2006 @@ -16,7 +16,7 @@ Summary(pl): Silnik On2 Flix Name: flixengine Version: 8.0.7.1 -Release: 0.10 +Release: 0.11 License: not distributable Group: Applications # download demo from http://flix.on2.com/demos/ @@ -45,9 +45,6 @@ ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# FIXME: FHS 2.x violation -%define _libexecdir %{_prefix}/libexec - %description The On2 Flix Engine provides many of the Flash 8 video encoding features of our industry leading On2 Flix Pro video encoder in a @@ -255,6 +252,7 @@ ./install.sh \ --prefix=$RPM_BUILD_ROOT%{_prefix} \ --mandir=$RPM_BUILD_ROOT%{_mandir} \ + --mencoderbin=$RPM_BUILD_ROOT%{_bindir} \ --flixsamples=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ --pidfile=$RPM_BUILD_ROOT/var/run/flixd.pid \ --authdir=$RPM_BUILD_ROOT/var/lib/on2 \ @@ -315,6 +313,9 @@ cp -a testing/lib64/libflixengine2.so* $RPM_BUILD_ROOT%{_libdir} %endif +# avoid collision from mplayer package +mv $RPM_BUILD_ROOT%{_bindir}/mencoder{,-flixengine} + # do not put hardware fingerprint to rpm package > $RPM_BUILD_ROOT/var/lib/on2/hostinfo @@ -363,11 +364,7 @@ %{_mandir}/man8/flixd.8* %dir /var/lib/on2 %config(noreplace) %verify(not md5 mtime size) /var/lib/on2/hostinfo -# TODO: FHS fix -%dir %{_libexecdir} -%dir %{_libexecdir}/on2 -%dir %{_libexecdir}/on2/flixengine -%attr(755,root,root) %{_libexecdir}/on2/flixengine/mencoder +%attr(755,root,root) %{_bindir}/mencoder-flixengine %files libs %defattr(644,root,root,755) @@ -433,6 +430,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2006/12/29 13:45:23 glen +- install mencoder to system bindir + Revision 1.23 2006/12/29 09:25:16 glen - flixd does not link with flix libs, otoh you can't run server and client on different host ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flixengine.spec?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
