X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=linux-gpib.spec;h=51b6331847082cf18a0d64736a9ada20ce9e51f1;hb=659cb172c8adafe983e01fef846cfcbffdddab0a;hp=9748a0947e046a95ffc724b4adb1923603c01357;hpb=55cbc6e3fc15eb3752b189f9c878802b9d6a3168;p=packages%2Flinux-gpib.git diff --git a/linux-gpib.spec b/linux-gpib.spec index 9748a09..51b6331 100644 --- a/linux-gpib.spec +++ b/linux-gpib.spec @@ -2,18 +2,18 @@ # Conditional build: %bcond_without kernel # kernel modules %bcond_without drivers_isa # ISA kernel drivers [ix86 only] -%bcond_without drivers_pcmcia # PCMCIA support in kernel drivers %bcond_without drivers_usb # USB kernel drivers %bcond_without userspace # userspace packages %bcond_without verbose # verbose modules build (V=1) -%bcond_without docs # documentation build +%bcond_without doc # documentation build %bcond_with hotplug # legacy hotplug support %bcond_without static_libs # static library %bcond_without guile # guile binding %bcond_without perl # Perl binding %bcond_with php # PHP binding -%bcond_without python # Python binding +%bcond_without python # Python (any) binding +%bcond_without python2 # Python 2.x binding %bcond_without tcl # Tcl binding # The goal here is to have main, userspace, package built once with @@ -27,41 +27,43 @@ exit 1 %ifnarch %{ix86} %undefine with_drivers_isa -%undefine with_drivers_pcmcia +%endif +%if %{without python} +%undefine with_python2 %endif -%include /usr/lib/rpm/macros.perl %define php_name php%{?php_suffix} -%define rel 1 +%define rel 3 %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.0 +Version: 4.3.3 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: 3085422695baf210b866601db6108860 +# Source0-md5: 1243aa44f788cf23f9b40ded54c14685 Patch2: %{pname}-python.patch Patch3: %{pname}-perl.patch Patch4: %{pname}-firmwaredir.patch Patch5: %{pname}-guile2.patch Patch6: %{pname}-php7.patch -Patch7: kernel-5.0.patch Patch8: kernel-5.2.patch +Patch9: kernel-5.10.patch +Patch10: pkgconfig-version.patch URL: http://linux-gpib.sourceforge.net/ BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: libtool -BuildRequires: rpmbuild(macros) >= 1.614 +BuildRequires: rpmbuild(macros) >= 1.745 %if %{with kernel} BuildRequires: kernel-module-build >= 3:2.6.8 %endif %if %{with userspace} BuildRequires: bison -%{?with_docs:BuildRequires: docbook-utils} +%{?with_doc:BuildRequires: docbook-utils} BuildRequires: flex %{?with_guile:BuildRequires: guile-devel >= 1.4} %{?with_perl:BuildRequires: perl-devel} @@ -171,17 +173,30 @@ PHP bindings for GPIB library. Wiązania PHP do biblioteki GPIB. %package -n python-gpib -Summary: Python bindings for GPIB library -Summary(pl.UTF-8): Wiązania Pythona do biblioteki GPIB +Summary: Python 2 bindings for GPIB library +Summary(pl.UTF-8): Wiązania Pythona 2 do biblioteki GPIB Group: Libraries/Python Requires: %{pname}-libs = %{version}-%{release} Requires: python-libs %description -n python-gpib -Python bindings for GPIB library. +Python 2 bindings for GPIB library. %description -n python-gpib -l pl.UTF-8 -Wiązania Pythona do biblioteki GPIB. +Wiązania Pythona 2 do biblioteki GPIB. + +%package -n python3-gpib +Summary: Python 3 bindings for GPIB library +Summary(pl.UTF-8): Wiązania Pythona 3 do biblioteki GPIB +Group: Libraries/Python +Requires: %{pname}-libs = %{version}-%{release} +Requires: python3-libs + +%description -n python3-gpib +Python 3 bindings for GPIB library. + +%description -n python3-gpib -l pl.UTF-8 +Wiązania Pythona 3 do biblioteki GPIB. %package -n tcl-gpib Summary: Tcl bindings for GPIB library @@ -240,10 +255,15 @@ Ten pakiet zawiera sterowniki dla Linuksa do urządzeń GPIB (IEEE 488).\ %define build_kernel_pkg()\ %{__make} VERBOSE=1 LINUX_SRCDIR=%{_kernelsrcdir}\ cd drivers/gpib\ +%if %{_kernel_version_code} < %{_kernel_version_magic 5 10 0}\ +%if %{with drivers_usb}\ +%install_kernel_modules -D installed -m lpvo_usb_gpib/lpvo_usb_gpib -d kernel/gpib\ +%endif\ +%endif\ %ifarch %{ix86}\ -%install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,lpvo_usb_gpib/lpvo_usb_gpib,ni_usb/ni_usb_gpib} -d kernel/gpib\ +%install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,ni_usb/ni_usb_gpib} -d kernel/gpib\ %else\ -%install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,hp_82341/hp_82341,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,lpvo_usb_gpib/lpvo_usb_gpib,ni_usb/ni_usb_gpib} -d kernel/gpib\ +%install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,hp_82341/hp_82341,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,ni_usb/ni_usb_gpib} -d kernel/gpib\ %endif\ cd ../..\ %{nil} @@ -263,21 +283,17 @@ cd linux-gpib-user-%{version} %patch4 -p1 %patch5 -p1 #%patch6 -p1 +%patch10 -p1 cd .. %endif %if %{with kernel} tar xzf linux-gpib-kernel-%{version}.tar.gz cd linux-gpib-kernel-%{version} -#%patch7 -p1 -#%ifarch %{ix86} -#%patch8 -p1 -#%endif - -# need to inject -I options before $(LINUXINCLUDE), the simplest way is to override CC -#for f in drivers/gpib/*/Makefile ; do -#echo 'override CC += $(EARLYCPPFLAGS)' >> $f -#done +%ifarch %{ix86} +%patch8 -p1 +%endif +%patch9 -p1 %endif %build @@ -293,9 +309,7 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.2" %endif %configure \ --with-udev-libdir=/lib/udev \ - %{?with_drivers_isa:--enable-isa} \ - %{?with_drivers_pcmcia:--enable-pcmcia} \ - %{!?with_docs:--disable-documentation} \ + %{!?with_doc:--disable-documentation} \ %{!?with_guile:--disable-guile-binding} \ %{!?with_perl:--disable-perl-binding} \ %{!?with_php:--disable-php-binding} \ @@ -304,6 +318,12 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/guile/2.2" %{!?with_tcl:--disable-tcl-binding} %{__make} + +%if %{with python2} +cd language/python +%py_build +cd ../.. +%endif cd .. %endif @@ -331,6 +351,12 @@ cd linux-gpib-user-%{version} UDEV_RULES_DIR=/lib/udev/rules.d \ USB_FIRMWARE_DIR=/lib/firmware +%if %{with python2} +cd language/python +%py_install +cd ../.. +%endif + %if %{with hotplug} # use udev paths as base and legacy hotplug as addon (not the opposite) install -d $RPM_BUILD_ROOT/etc/hotplug/usb @@ -384,7 +410,7 @@ cp -pr language/tcl/examples $RPM_BUILD_ROOT%{_examplesdir}/tcl-gpib-%{version} %endif %endif -%if %{with docs} +%if %{with doc} # packaged as %doc %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/linux-gpib-user/html %endif @@ -478,7 +504,7 @@ fi %attr(755,root,root) %{php_extensiondir}/gpib_php.so %endif -%if %{with python} +%if %{with python2} %files -n python-gpib %defattr(644,root,root,755) %doc linux-gpib-user-%{version}/language/python/README @@ -487,6 +513,16 @@ fi %{py_sitedir}/gpib-1.0-py*.egg-info %endif +%if %{with python} +%files -n python3-gpib +%defattr(644,root,root,755) +%doc linux-gpib-user-%{version}/language/python/README +%attr(755,root,root) %{py3_sitedir}/gpib.cpython-*.so +%{py3_sitedir}/Gpib.py +%{py3_sitedir}/__pycache__/Gpib.cpython-*.py[co] +%{py3_sitedir}/gpib-1.0-py*.egg-info +%endif + %if %{with tcl} %files -n tcl-gpib %defattr(644,root,root,755) @@ -496,7 +532,7 @@ fi %{_examplesdir}/tcl-gpib-%{version} %endif -%if %{with docs} +%if %{with doc} %files doc %defattr(644,root,root,755) %doc linux-gpib-user-%{version}/doc/doc_html/*