- changed CFLAGS to EXTRA_CFLAGS in %%{__make}, CFLAGS=... broke whole build

- %%{__make} -C driver install, to avoid rebuilding while install
- requires i2c, not kernel(i2c) (i2c modules pkg provides i2c)
- %%doc moved to main package, it should not be in pkg with kenrel modules
- updated to 0.75.86, STB

Changed files:
    bttv.spec -> 1.14

diff --git a/bttv.spec b/bttv.spec
index a1aa0ac3d463fe5df8ef3c0e5e603d3a45f550af..844d2f2f14c0011459d697b269c26bb8d0e084e4 100644 (file)
--- a/bttv.spec
+++ b/bttv.spec
@@ -10,7 +10,7 @@
 Summary:       BrookTree TV tuner driver
 Summary(pl):   Sterownik dla kart TV na chipsecie BrookTree
 Name:          bttv
 Summary:       BrookTree TV tuner driver
 Summary(pl):   Sterownik dla kart TV na chipsecie BrookTree
 Name:          bttv

-Version:       0.7.85
+Version:       0.7.86

 Release:       1
 License:       GPL
 Group:         Base/Kernel
 Release:       1
 License:       GPL
 Group:         Base/Kernel


@@ -21,7 +21,7 @@ Patch0:               %{name}-Makefile.patch
 URL:           http://www.strusel007.de/linux/bttv/
 %{!?_without_dist_kernel:BuildPrereq:  kernel-source}
 ExclusiveArch: %{ix86}
 URL:           http://www.strusel007.de/linux/bttv/
 %{!?_without_dist_kernel:BuildPrereq:  kernel-source}
 ExclusiveArch: %{ix86}

-Requires:      kernel(i2c)
+Requires:      i2c

 Prereq:                modutils
 BuildRequires: i2c-devel
 BuildConflicts:        kernel-source < 2.2.0
 Prereq:                modutils
 BuildRequires: i2c-devel
 BuildConflicts:        kernel-source < 2.2.0


@@ -59,15 +59,14 @@ Modu
 %patch0 -p1
 
 %build
 %patch0 -p1
 
 %build

-%{__make} CFLAGS="$RPM_OPT_FLAGS"
-
+%{__make} EXTRA_CFLAGS="$RPM_OPT_FLAGS"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C driver install DESTDIR=$RPM_BUILD_ROOT

 
 

-gzip -9nf CARDLIST Changes Insmod-options README* Sound-FAQ Specs
+gzip -9nf CARDLIST Changes Insmod-options README* Sound-FAQ Specs Cards

 
 %post
 /sbin/depmod -a
 
 %post
 /sbin/depmod -a


@@ -81,4 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n kernel%{smpstr}-misc-bttv
 %defattr(644,root,root,755)
 /lib/modules/*/misc/*
 %files -n kernel%{smpstr}-misc-bttv
 %defattr(644,root,root,755)
 /lib/modules/*/misc/*

+
+%files

 %doc *.gz
 %doc *.gz