- fix patch depth

[packages/linux-gpib.git] / linux-gpib.spec

diff --git a/linux-gpib.spec b/linux-gpib.spec
index 51b6331847082cf18a0d64736a9ada20ce9e51f1..b492823061da3a011a186cc5dca42611f172de7e 100644 (file)
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -25,6 +25,11 @@
 exit 1
 %endif
 
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define                _enable_debug_packages  0
+%endif
+
 %ifnarch %{ix86}
 %undefine      with_drivers_isa
 %endif
@@ -34,17 +39,17 @@ exit 1
 
 %define                php_name        php%{?php_suffix}
 
-%define                rel     3
+%define                rel     2
 %define                pname   linux-gpib
 Summary:       GPIB (IEEE 488) Linux support
 Summary(pl.UTF-8):     Obsługa GPIB (IEEE 488) dla Linuksa
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       4.3.3
+Version:       4.3.6
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/linux-gpib/%{pname}-%{version}.tar.gz
-# Source0-md5: 1243aa44f788cf23f9b40ded54c14685
+# Source0-md5: ffefc4e5c03b891c57f406a4b82395b7
 Patch2:                %{pname}-python.patch
 Patch3:                %{pname}-perl.patch
 Patch4:                %{pname}-firmwaredir.patch
@@ -53,14 +58,14 @@ Patch6:             %{pname}-php7.patch
 Patch8:                kernel-5.2.patch
 Patch9:                kernel-5.10.patch
 Patch10:       pkgconfig-version.patch
+Patch11:       linux-gpib-guile3.patch
+Patch12:       isa-dma.patch
 URL:           http://linux-gpib.sourceforge.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: rpmbuild(macros) >= 1.745
-%if %{with kernel}
-BuildRequires: kernel-module-build >= 3:2.6.8
-%endif
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
 %if %{with userspace}
 BuildRequires: bison
 %{?with_doc:BuildRequires:     docbook-utils}
@@ -253,6 +258,7 @@ Ten pakiet zawiera sterowniki dla Linuksa do urządzeń GPIB (IEEE 488).\
 %{nil}
 
 %define build_kernel_pkg()\
+%{__make} VERBOSE=1 LINUX_SRCDIR=%{_kernelsrcdir} clean\
 %{__make} VERBOSE=1 LINUX_SRCDIR=%{_kernelsrcdir}\
 cd drivers/gpib\
 %if %{_kernel_version_code} < %{_kernel_version_magic 5 10 0}\
@@ -284,16 +290,18 @@ cd linux-gpib-user-%{version}
 %patch5 -p1
 #%patch6 -p1
 %patch10 -p1
+%patch11 -p1
 cd ..
 %endif
 
 %if %{with kernel}
 tar xzf linux-gpib-kernel-%{version}.tar.gz
 cd linux-gpib-kernel-%{version}
+%patch9 -p1
 %ifarch %{ix86}
 %patch8 -p1
 %endif
-%patch9 -p1
+%patch12 -p1
 %endif
 
 %build
@@ -305,7 +313,7 @@ cd linux-gpib-user-%{version}
 %{__autoheader}
 %{__automake}
 %if %{with guile}
-CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.2"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/3.0"
 %endif
 %configure \
        --with-udev-libdir=/lib/udev \
@@ -442,9 +450,11 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gpib.conf
 %attr(755,root,root) %{_bindir}/ibterm
 %attr(755,root,root) %{_bindir}/ibtest
+%attr(755,root,root) %{_bindir}/findlisteners
 %attr(755,root,root) %{_sbindir}/gpib_config
 /lib/udev/rules.d/98-gpib-generic.rules
 /lib/udev/rules.d/99-agilent_82357a.rules
+/lib/udev/rules.d/99-lpvo_usb_gpib.rules
 /lib/udev/rules.d/99-ni_usb_gpib.rules
 %attr(755,root,root) /lib/udev/gpib_udev_config
 %attr(755,root,root) /lib/udev/gpib_udev_fxloader