rpms/fmio/devel fmio-2.0.8-nodirectio.patch, 1.3, 1.4 fmio.spec, 1.3, 1.4

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/fmio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22231

Modified Files:
	fmio-2.0.8-nodirectio.patch fmio.spec 
Log Message:
Don't build utils.

fmio-2.0.8-nodirectio.patch:

Index: fmio-2.0.8-nodirectio.patch
===================================================================
RCS file: /cvs/extras/rpms/fmio/devel/fmio-2.0.8-nodirectio.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fmio-2.0.8-nodirectio.patch	11 Nov 2007 23:15:15 -0000	1.3
+++ fmio-2.0.8-nodirectio.patch	11 Nov 2007 23:41:38 -0000	1.4
@@ -1,6 +1,18 @@
+diff -up fmio-2.0.8/Makefile.nodirectio fmio-2.0.8/Makefile
+--- fmio-2.0.8/Makefile.nodirectio	2007-11-12 01:10:10.000000000 +0200
++++ fmio-2.0.8/Makefile	2007-11-12 01:29:13.000000000 +0200
+@@ -1,4 +1,7 @@
+-SUBDIRS = src utils xsrc
++SUBDIRS = src xsrc
++ifeq ($(WITH_DIRECT_IO),y)
++SUBDIRS += utils
++endif
+ 
+ all:
+ 	for i in $(SUBDIRS); do \
 diff -up fmio-2.0.8/src/radio.c.nodirectio fmio-2.0.8/src/radio.c
---- fmio-2.0.8/src/radio.c.nodirectio	2007-11-12 01:02:12.000000000 +0200
-+++ fmio-2.0.8/src/radio.c	2007-11-12 01:02:12.000000000 +0200
+--- fmio-2.0.8/src/radio.c.nodirectio	2007-11-12 01:10:10.000000000 +0200
++++ fmio-2.0.8/src/radio.c	2007-11-12 01:10:10.000000000 +0200
 @@ -46,6 +46,7 @@
  #define MMAX(a,b)	((a) >= (b) ? (a) : (b))
  
@@ -20,8 +32,8 @@
  
  struct tuner_drv_t **drv_db;
 diff -up fmio-2.0.8/src/Makefile.nodirectio fmio-2.0.8/src/Makefile
---- fmio-2.0.8/src/Makefile.nodirectio	2007-11-12 01:02:12.000000000 +0200
-+++ fmio-2.0.8/src/Makefile	2007-11-12 01:02:12.000000000 +0200
+--- fmio-2.0.8/src/Makefile.nodirectio	2007-11-12 01:10:10.000000000 +0200
++++ fmio-2.0.8/src/Makefile	2007-11-12 01:10:10.000000000 +0200
 @@ -23,17 +23,23 @@ HDRS= bu2614.h lm700x.h pt2254a.h radio.
  ALLHDRS= $(HDRS) export.h mixer.h ostypes.h pci.h
  OBJS= access.o bu2614.o lm700x.o mixer.o pci.o pt2254a.o radio.o tc921x.o \
@@ -62,7 +74,7 @@
  	@echo "groff -Tascii -mandoc $(MANPAGE) > $@"
 diff -up fmio-2.0.8/src/radio_drv.h.nodirectio fmio-2.0.8/src/radio_drv.h
 --- fmio-2.0.8/src/radio_drv.h.nodirectio	2003-05-13 18:08:44.000000000 +0300
-+++ fmio-2.0.8/src/radio_drv.h	2007-11-12 01:08:28.000000000 +0200
++++ fmio-2.0.8/src/radio_drv.h	2007-11-12 01:10:10.000000000 +0200
 @@ -32,7 +32,16 @@
  #include <sys/ioctl.h>
  
@@ -82,7 +94,7 @@
  #include <machine/ioctl_bt848.h>
 diff -up fmio-2.0.8/src/access.c.nodirectio fmio-2.0.8/src/access.c
 --- fmio-2.0.8/src/access.c.nodirectio	2003-05-13 18:08:44.000000000 +0300
-+++ fmio-2.0.8/src/access.c	2007-11-12 01:02:12.000000000 +0200
++++ fmio-2.0.8/src/access.c	2007-11-12 01:10:10.000000000 +0200
 @@ -52,7 +52,7 @@ const char *radio_device_1 = "/dev/radio
  const char *radio_device_2 = "/dev/radio0";
  #endif /* linux */


Index: fmio.spec
===================================================================
RCS file: /cvs/extras/rpms/fmio/devel/fmio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fmio.spec	11 Nov 2007 22:30:58 -0000	1.3
+++ fmio.spec	11 Nov 2007 23:41:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	FM radio card manipulation utility
 Name:		fmio
 Version:	2.0.8
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	BSD
 Group:		Applications/Multimedia
 URL:		http://jumbo.narod.ru/fmio.html
@@ -110,8 +110,10 @@
 %{_bindir}/fmio-wrapper.py
 %exclude %{_bindir}/fmio-wrapper.py[co]
 %{_mandir}/man1/fmio.1*
+%if 0%{?_with_direct_io}
 %{_bindir}/bktrctl
 %{_bindir}/fmrinit
+%endif
 %doc Changelog README doc/FAQ
 %doc README.fedora
 %doc LICENSE
@@ -129,7 +131,7 @@
 %config(noreplace) %{_sysconfdir}/wmfmiorc
 
 %changelog
-* Sun Nov 11 2007 Andy Shevchenko <andy at smile.org.ua> 2.0.8-9
+* Sun Nov 11 2007 Andy Shevchenko <andy at smile.org.ua> 2.0.8-10
 - do not require WindowMaker for GUI part (#222758)
 - do not build drivers with direct I/O (#205721)