SPECS: flixengine.spec - use private ffmpeg libs to avoid mixed li...

[glen]

Author: glen                         Date: Mon Mar 17 12:40:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use private ffmpeg libs to avoid mixed libs being used

---- Files affected:
SPECS:
   flixengine.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/flixengine.spec
diff -u SPECS/flixengine.spec:1.59 SPECS/flixengine.spec:1.60
--- SPECS/flixengine.spec:1.59	Wed Feb  6 15:19:49 2008
+++ SPECS/flixengine.spec	Mon Mar 17 13:40:04 2008
@@ -20,7 +20,7 @@
 Summary(pl.UTF-8):	Silnik On2 Flix
 Name:		flixengine
 Version:	8.0.10.1
-Release:	0.2
+Release:	0.6
 License:	(probably) not distributable
 Group:		Applications
 # download demo from http://flix.on2.com/demos/
@@ -402,10 +402,12 @@
 %endif
 
 # we have already newer soname for libavformat.so in ffmpeg-libs
-# copy from bundled ones.
-install supportlibs/libavformat.so.51.12.2 $RPM_BUILD_ROOT%{_prefix}/lib
-install supportlibs/libavcodec.so.51.41.0 $RPM_BUILD_ROOT%{_prefix}/lib
-install supportlibs/libavutil.so.49.5.0 $RPM_BUILD_ROOT%{_prefix}/lib
+# copy from bundled ones to private directory
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/flixd
+install supportlibs/libavformat.so.* $RPM_BUILD_ROOT%{_prefix}/lib/flixd
+install supportlibs/libavcodec.so.* $RPM_BUILD_ROOT%{_prefix}/lib/flixd
+install supportlibs/libavutil.so.* $RPM_BUILD_ROOT%{_prefix}/lib/flixd
+ldconfig -N $RPM_BUILD_ROOT%{_prefix}/lib/flixd
 
 # avoid collision from mplayer package
 mv $RPM_BUILD_ROOT%{_bindir}/mencoder{,-flixengine}
@@ -439,10 +441,16 @@
 fi
 
 %{_sbindir}/lget -u "$FLIX_USERNAME" -s "$FLIX_SERIAL" -i %{_sysconfdir}/hostinfo -o %{_sysconfdir}/flixengine.lic -a 'On2FlixEngine/%{full_version} (%(uname -o))'
-echo ""
-echo "Serial registered and saved into %{_sysconfdir}/flixengine.lic"
-echo ""
-echo "Run \"/sbin/service flixd start\" to start flixd"
+if [ $? = 0 ]; then
+	echo >&2 ""
+	echo >&2 "Serial registered and saved into %{_sysconfdir}/flixengine.lic"
+	echo >&2 ""
+	echo >&2 "Run \"/sbin/service flixd start\" to start flixd"
+else
+	echo >&2 ""
+	echo >&2 "There was error registering your license key."
+	exit 1
+fi
 EOF
 
 %clean
@@ -453,7 +461,7 @@
 %useradd -u 179 -g flixd -c "On2 Flixd" flixd
 
 %post
-/sbin/ldconfig
+/sbin/ldconfig %{_prefix}/lib/flixd
 /sbin/chkconfig --add flixd
 if [ ! -f /var/log/flixd.log ]; then
 	touch /var/log/flixd.log
@@ -479,7 +487,7 @@
 fi
 
 %postun
-/sbin/ldconfig
+/sbin/ldconfig %{_prefix}/lib/flixd
 if [ "$1" = "0" ]; then
 	%userremove flixd
 	%groupremove flixd
@@ -504,9 +512,13 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/flixd-license.conf
 %attr(640,root,flixd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostinfo
 %attr(640,root,flixd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/flixengine.lic
-%attr(755,root,root) %{_prefix}/lib/libavformat.so.*.*.*
-%attr(755,root,root) %{_prefix}/lib/libavcodec.so.*.*.*
-%attr(755,root,root) %{_prefix}/lib/libavutil.so.*.*.*
+%dir %{_prefix}/lib/flixd
+%attr(755,root,root) %{_prefix}/lib/flixd/libavcodec.so.*.*.*
+%attr(755,root,root) %ghost %{_prefix}/lib/flixd/libavcodec.so.51
+%attr(755,root,root) %{_prefix}/lib/flixd/libavformat.so.*.*.*
+%attr(755,root,root) %ghost %{_prefix}/lib/flixd/libavformat.so.51
+%attr(755,root,root) %{_prefix}/lib/flixd/libavutil.so.*.*.*
+%attr(755,root,root) %ghost %{_prefix}/lib/flixd/libavutil.so.49
 %attr(755,root,root) %{_sbindir}/flixd
 %attr(755,root,root) %{_sbindir}/flixd-license-get
 %attr(755,root,root) %{_sbindir}/lget
@@ -591,6 +603,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2008-03-17 12:40:04  glen
+- use private ffmpeg libs to avoid mixed libs being used
+
 Revision 1.59  2008-02-06 14:19:49  glen
 - disable python/java (broken)
 - package ghost soname symlinks
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/flixengine.spec?r1=1.59&r2=1.60&f=u