SPECS: mythplugins.spec - fixed amd64 build - added macros.perl fo...

[glen]

Author: glen                         Date: Thu Sep  8 22:14:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed amd64 build
- added macros.perl for mythvideo scripts

---- Files affected:
SPECS:
   mythplugins.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/mythplugins.spec
diff -u SPECS/mythplugins.spec:1.6 SPECS/mythplugins.spec:1.7
--- SPECS/mythplugins.spec:1.6	Thu Sep  8 16:48:54 2005
+++ SPECS/mythplugins.spec	Fri Sep  9 00:14:06 2005
@@ -1,18 +1,21 @@
 # $Revision$, $Date$
 # disable mythmusic,mythphone due to https://bugs.pld-linux.org/?do=details&id=5687
-%bcond_with	mythmusic
-%bcond_with mythphone
+%bcond_without	mythmusic
+%bcond_without mythphone
 #
+%include	/usr/lib/rpm/macros.perl
 Summary:	Main MythTV plugins.
 Name:		mythplugins
 Version:	0.18.1
-Release:	0.112.3
+Release:	0.112.9
 License:	GPL v2
 Group:		Applications/Multimedia
 URL:		http://www.mythtv.org/
 Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
 # Source0-md5:	1d94d19e2a13c24a408ced9b6c4f5b47
 Patch0:		%{name}-configure.patch
+BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	sed >= 4.0
 BuildRequires:	SDL-devel
 BuildRequires:	X11-OpenGL-devel
 BuildRequires:	XFree86-devel
@@ -158,6 +161,11 @@
 cp %{_datadir}/mythtv/build/config.mak .
 sed -i -e '1iinclude(config.mak)'  settings.pro
 
+%ifarch %{x8664}
+	# mmx asm isn't x86_64 compatible in mythmusic
+    echo 'DEFINES -= HAVE_MMX' >> settings.pro
+%endif
+
 # Fix /mnt/store -> /var/lib/mythmusic
 sed -i -e's|/mnt/store/music|/var/lib/mythmusic|' mythmusic/mythmusic/globalsettings.cpp
 # Fix /mnt/store -> /var/lib/mythmusic
@@ -195,12 +203,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/mythtv/games/snes/{roms,screens}
 install -d $RPM_BUILD_ROOT%{_datadir}/mythtv/games/xmame/{roms,screens,flyers,cabs}
 install -d $RPM_BUILD_ROOT%{_datadir}/mythtv/games/PC/screens
-install -d $RPM_BUILD_ROOT%{_datadir}/xmame
-ln -s %{_datadir}/xmame $RPM_BUILD_ROOT%{_datadir}/mythtv/games/xmame
-install -d $RPM_BUILD_ROOT%{_datadir}/xmame/flyers
-ln -s snap $RPM_BUILD_ROOT%{_datadir}/xmame/screens
-
-cp -a mythgame/gamelist.xml $RPM_BUILD_ROOT%{_datadir}/mythtv/games/PC/
+cp -a mythgame/gamelist.xml $RPM_BUILD_ROOT%{_datadir}/mythtv/games/PC
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -276,9 +279,11 @@
 %{_datadir}/mythtv/themes/default/mv_*.png
 %{_datadir}/mythtv/video_settings.xml
 %{_datadir}/mythtv/videomenu.xml
+%dir %{_datadir}/mythtv/mythvideo
+%dir %{_datadir}/mythtv/mythvideo/scripts
 %{_datadir}/mythtv/mythvideo/scripts/README
-%{_datadir}/mythtv/mythvideo/scripts/imdb.pl
-%{_datadir}/mythtv/mythvideo/scripts/allocine.pl
+%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/imdb.pl
+%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/allocine.pl
 /var/lib/mythvideo
 
 %files -n mythweather
@@ -320,8 +325,8 @@
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythgame.so
 %{_datadir}/mythtv/games
 #%config %{_datadir}/mythtv/games/PC/gamelist.xml
-%{_datadir}/xmame/screens
-%{_datadir}/xmame/flyers
+#%{_datadir}/xmame/screens
+#%{_datadir}/xmame/flyers
 %{_datadir}/mythtv/game_settings.xml
 %{_datadir}/mythtv/themes/default/game-ui.xml
 %{_datadir}/mythtv/i18n/mythgame_*.qm
@@ -372,6 +377,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/09/08 22:14:06  glen
+- fixed amd64 build
+- added macros.perl for mythvideo scripts
+
 Revision 1.6  2005/09/08 14:48:54  glen
 - fix libmyth-devel BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mythplugins.spec?r1=1.6&r2=1.7&f=u