SPECS: xmame.spec - merged with DEVEL

shadzik shadzik at pld-linux.org
Tue May 2 23:56:32 CEST 2006 

Author: shadzik                      Date: Tue May  2 21:56:31 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged with DEVEL

---- Files affected:
SPECS:
   xmame.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/xmame.spec
diff -u SPECS/xmame.spec:1.58 SPECS/xmame.spec:1.59
--- SPECS/xmame.spec:1.58	Wed Sep  7 00:04:46 2005
+++ SPECS/xmame.spec	Tue May  2 23:56:26 2006
@@ -5,38 +5,32 @@
 %bcond_without	qt	# don't build qtmame
 #
 %define		qtmame		qtmame
-%define		qtmame_ver	2.0.4
+%define		qtmame_ver	2.0.6
 Summary:	Unix/X11 port of M.A.M.E. - arcade machine emulator
 Summary(es):	X-Mame Arcade Game Emulator
 Summary(ko):	XŔŠľľżě ˝Ă˝şĹŰŔť Ŕ§ÇŃ ž÷źŇżë °ÔŔÓąâ żĄš°ˇšŔĚĹÍ
 Summary(pl):	Port emulatora M.A.M.E. działający w środowisku Unix/X11
 Summary(pt_BR):	Emulador de Arcades X-Mame
 Name:		xmame
-Version:	0.86
-Release:	3
+Version:	0.105
+Release:	1
 License:	GPL
 Group:		Applications/Emulators
 #Source0Download:	http://x.mame.net/xmame-doc-7.html
 Source0:	http://x.mame.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	b16782cd620ef970233eacd65462ad74
+# Source0-md5:	18979c881aa0034d5d6a172d4263af3e
 Source1:	http://lecha.homelinux.com/ingenio/archivos/%{qtmame}-%{qtmame_ver}.tar.gz
-# Source1-md5:	28fcd7859d0ad4f42091923cb2932ba2
+# Source1-md5:	69b568b8e68877a11b2ffa4845829bb1
 Source2:	%{name}-SDL.desktop
 Source3:	%{name}-x11.desktop
-Source4:	%{name}-alsa_0.5.c
-Source5:	%{name}-alsa_0.9.c
-Source6:	%{name}.png
-Source7:	%{name}-qtmame.desktop
-Source8:	%{name}-qtmame_pl.ts
-Source9:	http://x.mame.net/download/%{name}-doc.pdf
-# Source9-md5:	36e83bbe08fe95de6562b40654a37954
-Patch0:		%{name}-alsa.patch
-Patch1:		%{qtmame}-pl.patch
-Patch2:		%{qtmame}-version.patch
-Patch3:		%{name}-svgalib.patch
+Source4:	%{name}.png
+Source5:	%{name}-qtmame.desktop
+Source6:	%{name}-qtmame_pl.ts
+Source7:	http://x.mame.net/download/%{name}-doc.pdf
+# Source9-md5:	f4a7b59d020ce35decd03b67639639a2
 URL:		http://x.mame.net/
 BuildRequires:	SDL-devel
-BuildRequires:	XFree86-devel
+#BuildRequires:	XFree86-devel
 BuildRequires:	alsa-driver-devel >= 0.9
 BuildRequires:	artsc-devel
 BuildRequires:	automake
@@ -249,16 +243,10 @@
 
 %prep
 %setup -q -a1
-#%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-install %{SOURCE4} src/unix/sysdep/dsp-drivers/alsa_0.5.c
-install %{SOURCE5} src/unix/sysdep/dsp-drivers/alsa_0.9.c
-install %{SOURCE9} doc/
+install %{SOURCE7} doc/
 %if %{with qt}
 install %{_datadir}/automake/config.* %{qtmame}-%{qtmame_ver}/admin
-install %{SOURCE8} %{qtmame}-%{qtmame_ver}/qtmame/qtmame_pl.ts
+install %{SOURCE6} %{qtmame}-%{qtmame_ver}/qtmame/qtmame_pl.ts
 lrelease %{qtmame}-%{qtmame_ver}/qtmame/qtmame.pro
 %endif
 
@@ -282,7 +270,6 @@
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I/usr/X11R6/include" \
 	LD="%{__cc} %{rpmldflags}" \
 	DISPLAY_METHOD=SDL \
 	SOUND_ESOUND=1 \
@@ -290,14 +277,13 @@
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
-	XMAME_NET=1
+	#XMAME_NET=1
 
 %{__make} -f makefile.unix \
 	TARGET=mess \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I/usr/X11R6/include" \
 	LD="%{__cc} %{rpmldflags}" \
 	X11LIB="-L/usr/X11R6/%{_lib}" \
 	DISPLAY_METHOD=x11 \
@@ -306,7 +292,7 @@
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
-	XMAME_NET=1
+	#XMAME_NET=1
 
 %if %{with svga}
 %{__make} -f makefile.unix \
@@ -314,7 +300,6 @@
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I/usr/X11R6/include" \
 	LD="%{__cc} %{rpmldflags}" \
 	DISPLAY_METHOD=svgalib \
 	SOUND_ESOUND=1 \
@@ -322,14 +307,13 @@
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
-	XMAME_NET=1
+	#XMAME_NET=1
 %endif
 
 %{__make} -f makefile.unix \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I/usr/X11R6/include" \
 	LD="%{__cc} %{rpmldflags}" \
 	DISPLAY_METHOD=SDL \
 	SOUND_ESOUND=1 \
@@ -337,14 +321,13 @@
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
-	XMAME_NET=1
+	#XMAME_NET=1
 
 %if %{with svga}
 %{__make} -f makefile.unix \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I/usr/X11R6/include" \
 	LD="%{__cc} %{rpmldflags}" \
 	DISPLAY_METHOD=svgalib \
 	SOUND_ESOUND=1 \
@@ -352,14 +335,13 @@
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
-	XMAME_NET=1
+	#XMAME_NET=1
 %endif
 
 %{__make} -f makefile.unix \
 	PREFIX=%{_prefix} \
 	XMAMEROOT=%{_datadir}/games/%{name} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -I/usr/X11R6/include" \
 	LD="%{__cc} %{rpmldflags}" \
 	X11LIB="-L/usr/X11R6/%{_lib}" \
 	DISPLAY_METHOD=x11 \
@@ -368,7 +350,7 @@
 	SOUND_ARTS_TEIRA=1 \
 	SOUND_ARTS_SMOTEK=1 \
 	SOUND_SDL=1 \
-	XMAME_NET=1
+	#XMAME_NET=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -390,12 +372,12 @@
 cp -R src/unix/cab/ $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 
 install src/unix/doc/xmame.6 $RPM_BUILD_ROOT%{_mandir}/man6
-install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 
 %if %{with qt}
-install %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
 
 install %{qtmame}-%{qtmame_ver}/qtmame/qtmame $RPM_BUILD_ROOT%{_bindir}
 install %{qtmame}-%{qtmame_ver}/qtmame/qtmame.png $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -465,6 +447,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/05/02 21:56:26  shadzik
+- merged with DEVEL
+
+Revision 1.58.2.3  2006/05/02 21:50:52  shadzik
+- builds; note that xmame has broken network support in this version
+
+Revision 1.58.2.2  2006/05/01 23:24:14  shadzik
+- reverted invalid BR fix
+
+Revision 1.58.2.1  2006/05/01 22:51:12  shadzik
+- up to 0.105, qtmame to 2.0.6
+- BR fix
+- somethings wrong with %{name}.SDL and %{name}.svgalib bins
+
 Revision 1.58  2005/09/06 22:04:46  arekm
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xmame.spec?r1=1.58&r2=1.59&f=u

More information about the pld-cvs-commit mailing list