SPECS (AC-branch): mplayer.spec - multiarch support
sparky
sparky at pld-linux.org
Fri Apr 21 11:11:06 CEST 2006
Author: sparky Date: Fri Apr 21 09:11:06 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- multiarch support
---- Files affected:
SPECS:
mplayer.spec (1.316.2.3 -> 1.316.2.4)
---- Diffs:
================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.316.2.3 SPECS/mplayer.spec:1.316.2.4
--- SPECS/mplayer.spec:1.316.2.3 Mon Mar 20 11:57:28 2006
+++ SPECS/mplayer.spec Fri Apr 21 11:11:01 2006
@@ -53,6 +53,13 @@
%ifarch %{x8664}
%undefine with_runtime
%endif
+
+%if %{_lib} == "lib64"
+%define _suf 64
+%else
+%define _suf 32
+%endif
+
# set it to 0, or 1
%define snapshot 0
@@ -439,11 +446,14 @@
# executables
%if %{with mencoder}
-install mencoder $RPM_BUILD_ROOT%{_bindir}
+install mencoder $RPM_BUILD_ROOT%{_bindir}/mencoder%{_suf}
+ln -sf mencoder%{_suf} $RPM_BUILD_ROOT%{_bindir}/mencoder
%endif
-install mplayer $RPM_BUILD_ROOT%{_bindir}
+install mplayer $RPM_BUILD_ROOT%{_bindir}/mplayer%{_suf}
+ln -sf mplayer%{_suf} $RPM_BUILD_ROOT%{_bindir}/mplayer
%if %{with gui}
-install gmplayer $RPM_BUILD_ROOT%{_bindir}
+install gmplayer $RPM_BUILD_ROOT%{_bindir}/gmplayer%{_suf}
+ln -sf gmplayer%{_suf} $RPM_BUILD_ROOT%{_bindir}/gmplayer
%endif
# fonts
@@ -495,12 +505,12 @@
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mplayer
+%attr(755,root,root) %{_bindir}/mplayer*
%if %{with gui}
%files -n gmplayer
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gmplayer
+%attr(755,root,root) %{_bindir}/gmplayer*
%{_desktopdir}/gmplayer.desktop
%dir %{_datadir}/%{name}/Skin
%ghost %{_datadir}/%{name}/Skin/default
@@ -510,7 +520,7 @@
%defattr(644,root,root,755)
%doc DOCS/tech/encoding-tips.txt DOCS/tech/swscaler_filters.txt
%doc DOCS/tech/swscaler_methods.txt DOCS/tech/colorspaces.txt
-%attr(755,root,root) %{_bindir}/mencoder
+%attr(755,root,root) %{_bindir}/mencoder*
%files common
%defattr(644,root,root,755)
@@ -561,6 +571,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.316.2.4 2006/04/21 09:11:01 sparky
+- multiarch support
+
Revision 1.316.2.3 2006/03/20 10:57:28 qboosh
- added CVE-2005-4048 patch (heap overflow exploitable via PNG images)
- release .2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.316.2.3&r2=1.316.2.4&f=u
More information about the pld-cvs-commit
mailing list