SPECS: flixengine.spec - amd64 build fixes

[glen]

Author: glen                         Date: Wed Apr 11 19:20:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- amd64 build fixes

---- Files affected:
SPECS:
   flixengine.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/flixengine.spec
diff -u SPECS/flixengine.spec:1.33 SPECS/flixengine.spec:1.34
--- SPECS/flixengine.spec:1.33	Wed Apr 11 20:42:22 2007
+++ SPECS/flixengine.spec	Wed Apr 11 21:20:34 2007
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	Silnik On2 Flix
 Name:		flixengine
 Version:	8.0.8.1
-Release:	0.1
+Release:	0.2
 License:	not distributable
 Group:		Applications
 # download demo from http://flix.on2.com/demos/
@@ -54,6 +54,11 @@
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# should not provide such deps
+%define		_noautoprov libavcodec.so.51 libavutil.so.49
+# need to provide it for flixd, but we don't want package name dep here
+%define		_noautoreqdep libavformat.so.50
+
 %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
@@ -218,6 +223,9 @@
 
 ' install.sh
 
+# remove backups from patching as we use globs to package files to buildroot
+find flixsamples '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
+
 %build
 cd .flix-engine-installation-files
 PWD=$(pwd)
@@ -339,8 +347,15 @@
 
 %ifarch %{x8664}
 cp -a testing/lib64/libflixengine2.so* $RPM_BUILD_ROOT%{_libdir}
+# flixd linked statically and other libs are 64 bit
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/libflixengine2*.so*
 %endif
 
+# we have already newer soname for libavformat.so
+# might need to copy other ffmpeg libs too, but their major is same so should
+# be compatible: libavcodec.so.51.21.0 libavutil.so.49.0.1
+install supportlibs/libavformat.so.50.6.0 $RPM_BUILD_ROOT%{_prefix}/lib
+
 # avoid collision from mplayer package
 mv $RPM_BUILD_ROOT%{_bindir}/mencoder{,-flixengine}
 
@@ -418,19 +433,22 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}/lib/libflixengine2.so.*.*
-%attr(755,root,root) %{_prefix}/lib/libflixengine2_core.so.*.*
 %ifarch %{x8664}
 %attr(755,root,root) %{_libdir}/libflixengine2.so.*.*
+%else
+%attr(755,root,root) %{_libdir}/libflixengine2.so.*.*
+%attr(755,root,root) %{_libdir}/libflixengine2_core.so.*.*
 %endif
+%attr(755,root,root) %{_prefix}/lib/libavformat.so.*.*.*
 %dir %{_examplesdir}/%{name}-%{version}
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}/lib/libflixengine2.so
-%attr(755,root,root) %{_prefix}/lib/libflixengine2_core.so
 %ifarch %{x8664}
 %attr(755,root,root) %{_libdir}/libflixengine2.so
+%else
+%attr(755,root,root) %{_libdir}/libflixengine2.so
+%attr(755,root,root) %{_libdir}/libflixengine2_core.so
 %endif
 %{_includedir}/flixengine2
 %{_examplesdir}/%{name}-%{version}/c
@@ -480,6 +498,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2007/04/11 19:20:34  glen
+- amd64 build fixes
+
 Revision 1.33  2007/04/11 18:42:22  glen
 - update to 8.0.8.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/flixengine.spec?r1=1.33&r2=1.34&f=u