- up to 4.2.57

[packages/vpb-driver.git] / vpb-driver.spec

diff --git a/vpb-driver.spec b/vpb-driver.spec
index 260434be5998055787f2ed559ee7b85c41bce473..073bd621b17261fa3ef0e9824e9e73d94a35409f 100644 (file)
--- a/vpb-driver.spec
+++ b/vpb-driver.spec
@@ -18,14 +18,13 @@
 Summary:       Voicetronix voice processing board (VPB) driver software
 Summary(pl.UTF-8):     Oprogramowanie sterowników dla kart przetwarzających głos (VPB) Voicetronix
 Name:          %{pname}%{_alt_kernel}
-Version:       4.2.55
+Version:       4.2.57
 Release:       %{rel}
 License:       LGPL v2.1+ (libraries), GPL v2+ (libpri library, kernel module)
 Group:         Libraries
 Source0:       http://www.voicetronix.com.au/Downloads/vpb-driver-4.x/%{pname}-%{version}.tar.gz
-# Source0-md5: d014a29043334923e0976a9273627b63
+# Source0-md5: 35d0ea8ab7a6bda267603ca7c9b78671
 Patch0:                %{pname}-make.patch
-Patch1:                %{pname}-kernel.patch
 URL:           http://www.voicetronix.com.au/downloads.htm#linux
 %if %{with dist_kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build
@@ -105,7 +104,6 @@ Sterownik jądra Linuksa do kart VPB firmy Voicetronix.
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %if %{without kernel}
 %{__sed} -i -e 's,subdirs += $(srcdir)/vtcore $(srcdir)/vpb,,' src/Makefile.in
@@ -131,18 +129,34 @@ cd ..
 %configure \
        %{?with_pri:--with-pri} \
        --enable-shared
+
+%if %{without userspace}
+%{__make} -C src \
+       %{?with_kernel:KSRC=%{_kernelsrcdir}} \
+       VPATH=%{_libdir}
+%else
 %{__make} \
        %{?with_kernel:KSRC=%{_kernelsrcdir}} \
        VPATH=%{_libdir}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{without userspace}
+%{__make} -C src install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       %{?with_kernel:KSRC=%{_kernelsrcdir}}
+
+install -d $RPM_BUILD_ROOT/etc/modprobe.d
+install src/libvpb/blunt-axe.conf $RPM_BUILD_ROOT/etc/modprobe.d
+
+%else
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        %{?with_kernel:KSRC=%{_kernelsrcdir}}
 
-%if %{with userspace}
 # let rpm generate dependencies
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
@@ -203,7 +217,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with kernel}
-%files -n kernel-telephony-vpb
+%files -n kernel%{_alt_kernel}-telephony-vpb
 %defattr(644,root,root,755)
 %dir /lib/modules/%{_kernel_ver}/kernel/drivers/telephony
 /lib/modules/%{_kernel_ver}/kernel/drivers/telephony/vpb.ko*