[packages/linux-gpib] - fix building with kernel 5.0 - updated files

[baggins]

commit 302b72f6120162d2579447b1cf7effd33825f5c9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 10 19:06:41 2019 +0100

    - fix building with kernel 5.0
    - updated files

 linux-gpib-firmwaredir.patch | 12 ++++++------
 linux-gpib.spec              | 23 +++++++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index df82614..69aa510 100644
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -287,6 +287,11 @@ done
 %build
 %if %{with userspace}
 cd linux-gpib-user-%{version}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %if %{with guile}
 CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.0"
 %endif
@@ -318,10 +323,12 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}
 cd linux-gpib-kernel-%{version}
 %{expand:%install_kernel_packages}
 cp -a drivers/gpib/installed/* $RPM_BUILD_ROOT
+cd ..
 %endif
 
 %if %{with userspace}
-%{__make} -C linux-gpib-user-%{version} install \
+cd linux-gpib-user-%{version}
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	HOTPLUG_USB_CONF_DIR=/lib/udev \
 	UDEV_RULES_DIR=/lib/udev/rules.d \
@@ -384,8 +391,7 @@ cp -pr language/tcl/examples $RPM_BUILD_ROOT%{_examplesdir}/tcl-gpib-%{version}
 
 %if %{with docs}
 # packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/linux-gpib/html
-%endif
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/linux-gpib-user/html
 %endif
 
 %clean
@@ -411,6 +417,7 @@ fi
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
+%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) %{_sbindir}/gpib_config
@@ -431,7 +438,7 @@ fi
 
 %files libs
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README README.HAMEG README.hp82335 TODO
+%doc linux-gpib-user-%{version}/{AUTHORS,ChangeLog,README,README.HAMEG,README.hp82335,TODO}
 %attr(755,root,root) %{_libdir}/libgpib.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgpib.so.0
 
@@ -457,7 +464,7 @@ fi
 %if %{with perl}
 %files -n perl-gpib
 %defattr(644,root,root,755)
-%doc language/perl/{Changes,README}
+%doc linux-gpib-user-%{version}/language/perl/{Changes,README}
 %{perl_vendorarch}/LinuxGpib.pm
 %dir %{perl_vendorarch}/auto/LinuxGpib
 %attr(755,root,root) %{perl_vendorarch}/auto/LinuxGpib/LinuxGpib.so
@@ -477,7 +484,7 @@ fi
 %if %{with python}
 %files -n python-gpib
 %defattr(644,root,root,755)
-%doc language/python/README
+%doc linux-gpib-user-%{version}/language/python/README
 %attr(755,root,root) %{py_sitedir}/gpib.so
 %{py_sitedir}/Gpib.py[co]
 %{py_sitedir}/gpib-1.0-py*.egg-info
@@ -486,7 +493,7 @@ fi
 %if %{with tcl}
 %files -n tcl-gpib
 %defattr(644,root,root,755)
-%doc language/tcl/README
+%doc linux-gpib-user-%{version}/language/tcl/README
 %attr(755,root,root) %{_libdir}/libgpib_tcl-%{version}.so
 %attr(755,root,root) %{_libdir}/libgpib_tcl.so
 %{_examplesdir}/tcl-gpib-%{version}
@@ -495,6 +502,6 @@ fi
 %if %{with docs}
 %files doc
 %defattr(644,root,root,755)
-%doc doc/doc_html/*
+%doc linux-gpib-user-%{version}/doc/doc_html/*
 %endif
 %endif
diff --git a/linux-gpib-firmwaredir.patch b/linux-gpib-firmwaredir.patch
index ef3a4b1..9c39f5c 100644
--- a/linux-gpib-firmwaredir.patch
+++ b/linux-gpib-firmwaredir.patch
@@ -1,10 +1,10 @@
---- linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a.orig	2016-04-09 15:33:10.000000000 +0200
-+++ linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a	2016-07-05 22:01:15.232112298 +0200
+--- linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a.in.orig	2016-04-09 15:33:10.000000000 +0200
++++ linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a.in	2016-07-05 22:01:15.232112298 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  
  GPIB_CONFIG_OPTIONS="--minor 0"
--DATADIR=/usr/share
+-DATADIR=@datadir@
 +FIRMWAREDIR=/lib/firmware
  FXLOAD=fxload
  FXLOAD_OPTIONS=
@@ -27,13 +27,13 @@
  	FXLOAD_OPTIONS="-t fx2"
  	;;
  
---- linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib.orig	2016-04-09 15:33:10.000000000 +0200
-+++ linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib	2016-07-05 22:01:43.015295116 +0200
+--- linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib.in.orig	2016-04-09 15:33:10.000000000 +0200
++++ linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib.in	2016-07-05 22:01:43.015295116 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  
  GPIB_CONFIG_OPTIONS="--minor 0"
--DATADIR=/usr/share
+-DATADIR=@datadir@
 +FIRMWAREDIR=/lib/firmware
  FXLOAD=fxload
  FXLOAD_OPTIONS="-t fx"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/302b72f6120162d2579447b1cf7effd33825f5c9