packages: playmidi/playmidi.spec, playmidi/playmidi-awe_voice.patch (NEW) -...

[evil]

Author: evil                         Date: Wed Dec 15 08:44:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added playmidi-awe_voice.patch and reverted in-spec change removing that header, because its no longer in-kernel

---- Files affected:
packages/playmidi:
   playmidi.spec (1.40 -> 1.41) , playmidi-awe_voice.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/playmidi/playmidi.spec
diff -u packages/playmidi/playmidi.spec:1.40 packages/playmidi/playmidi.spec:1.41
--- packages/playmidi/playmidi.spec:1.40	Tue Feb 13 09:06:41 2007
+++ packages/playmidi/playmidi.spec	Wed Dec 15 09:44:32 2010
@@ -13,7 +13,7 @@
 Summary(tr.UTF-8):	FM, GUS ve MIDI aygıtları üzerindeki midi dosyalarını çalar
 Name:		playmidi
 Version:	2.5
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Sound
 Source0:	http://dl.sourceforge.net/playmidi/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch0:		%{name}-hertz.patch
 Patch1:		%{name}-make.patch
 Patch2:		%{name}-midimap.patch
+Patch3:		%{name}-awe_voice.patch
 URL:		http://sourceforge.net/projects/playmidi/
 BuildRequires:	glib-devel >= 1.2
 %{?with_gtk:BuildRequires:	gtk+-devel >= 1.2}
@@ -29,7 +30,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/midi
-%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
+%define		_appdefsdir	/usr/share/X11/app-defaults
 
 %description
 Playmidi plays MIDI (Musicial Instrument Digital Interface) sound
@@ -132,16 +133,16 @@
 
 %prep
 %setup -q -n %{name}-2.4
-# awe_voice.h is now part of the kernel source.
-rm -f awe_voice.h
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} playmidi xplaymidi %{?with_gtk:gtkplaymidi} %{?with_svga:splaymidi} \
 	CC="%{__cc}" \
-LIBX11="-L%{_prefix}/X11R6/%{_lib} -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE" \
+	-I"$RPM_BUILD_ROOT" \
+LIBX11="-L%{_prefix}/%{_lib} -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE" \
 	%{?with_gtk:LIBGTK="`gtk-config --libs`"} \
 	OPT_FLAGS="%{rpmcflags} %{?with_gtk:`gtk-config --cflags`}" \
 	<<EOF
@@ -208,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2010/12/15 08:44:32  evil
+- added playmidi-awe_voice.patch and reverted in-spec change removing that header, because its no longer in-kernel
+
 Revision 1.40  2007/02/13 08:06:41  glen
 - tabs in preamble
 

================================================================
Index: packages/playmidi/playmidi-awe_voice.patch
diff -u /dev/null packages/playmidi/playmidi-awe_voice.patch:1.1
--- /dev/null	Wed Dec 15 09:44:38 2010
+++ packages/playmidi/playmidi-awe_voice.patch	Wed Dec 15 09:44:32 2010
@@ -0,0 +1,15 @@
+--- playmidi-2.4/playmidi.h-dist.orig	2010-12-15 08:39:42.880937000 +0100
++++ playmidi-2.4/playmidi.h-dist	2010-12-15 08:40:01.850937000 +0100
+@@ -52,11 +52,7 @@
+ #include <stdlib.h>
+ #include <sys/soundcard.h>
+ #include <sys/ioctl.h>
+-#ifdef linux
+-#include <linux/awe_voice.h>
+-#else
+-#include <awe_voice.h>
+-#endif
++#include "awe_voice.h"
+ 
+ struct chanstate {
+     int program;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/playmidi/playmidi.spec?r1=1.40&r2=1.41&f=u