- install mencoder to system bindir

Changed files:
    flixengine.init -> 1.7
    flixengine.spec -> 1.24

diff --git a/flixengine.init b/flixengine.init
index 840b0b88027488cf447458b3c59045a64d5eb658..f85f337060bb043e963f52648bd63bf08430d17c 100644 (file)
--- a/flixengine.init
+++ b/flixengine.init
@@ -10,14 +10,12 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-# set some variables
-export PATH=$PATH:/usr/libexec/on2/flixengine
 ## Specify the mencoder binary for flixd to use when decoding source files.
 ## If running flixd from the command line or using su within this script to run
 ## it as another user ensure that this environment variable is set. The default
 ## install path for mencoder will not be in PATH so without this variable set
 ## flixd will be unable to decode source files.
-export FLIXD_MENCODER=/usr/libexec/on2/flixengine/mencoder
+export FLIXD_MENCODER=/usr/bin/mencoder-flixengine
 
 AUTHDIR=/var/lib/on2
 

diff --git a/flixengine.spec b/flixengine.spec
index cc83042a8fb18672fc37237519ff6092a3744dfe..c7af01b02f59692598a3c297c165f2c0290dfb88 100644 (file)
--- a/flixengine.spec
+++ b/flixengine.spec
@@ -15,7 +15,7 @@ Summary:      On2 Flix Engine
 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/
@@ -44,9 +44,6 @@ Conflicts:    %{name}-libs > %{version}-%{release}
 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
@@ -254,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT
 ./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 \
@@ -314,6 +312,9 @@ ln -snf %{_prefix}/src/flixmodules/flixjava/doc $RPM_BUILD_ROOT%{_docdir}/on2/fl
 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
 
@@ -362,11 +363,7 @@ fi
 %{_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)