From 5e5b07d32e0a436ab6d1e91a4d8eb7d0f568be2365f9f388d95699c99a3998e9 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Sat, 25 Apr 2020 07:10:54 +0000 Subject: [PATCH 1/2] Accepting request 797580 from hamradio OBS-URL: https://build.opensuse.org/request/show/797580 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/hamlib?expand=0&rev=13 --- hamlib.changes | 5 +++++ hamlib.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hamlib.changes b/hamlib.changes index 4a3e246..195304d 100644 --- a/hamlib.changes +++ b/hamlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 24 23:31:46 UTC 2020 - Wojciech Kazubski + +- fix build for Tumbleweed + ------------------------------------------------------------------- Thu Aug 30 19:01:52 UTC 2018 - mardnh@gmx.de diff --git a/hamlib.spec b/hamlib.spec index 4183396..26b9692 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -193,8 +193,13 @@ make %{?_smp_mflags} check %{_libdir}/lua %files -n python-Hamlib +%if 0%{?suse_version} >= 1330 +%{python2_sitearch}/Hamlib.* +%{python2_sitearch}/_Hamlib.* +%else %{python_sitearch}/Hamlib.* %{python_sitearch}/_Hamlib.* +%endif %files -n tcl-Hamlib %dir %{_libdir}/tcl*/ From 70245aa67430f46f466ef4844042602132ffa26343e2235e39082cbf83686205 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Sat, 25 Apr 2020 08:28:26 +0000 Subject: [PATCH 2/2] Accepting request 797588 from home:pluskalm:branches:hardware:sdr - Do not build python2 bindings for Tumbleweed - Modernise spec file OBS-URL: https://build.opensuse.org/request/show/797588 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/hamlib?expand=0&rev=14 --- hamlib.changes | 5 +++-- hamlib.spec | 29 +++++++++++++++++------------ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/hamlib.changes b/hamlib.changes index 195304d..4a401f6 100644 --- a/hamlib.changes +++ b/hamlib.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Fri Apr 24 23:31:46 UTC 2020 - Wojciech Kazubski +Sat Apr 25 07:58:17 UTC 2020 - Martin Pluskal -- fix build for Tumbleweed +- Do not build python2 bindings for Tumbleweed +- Modernise spec file ------------------------------------------------------------------- Thu Aug 30 19:01:52 UTC 2018 - mardnh@gmx.de diff --git a/hamlib.spec b/hamlib.spec index 26b9692..3a9dbc8 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -1,7 +1,7 @@ # # spec file for package hamlib # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,7 +28,6 @@ URL: http://hamlib.sourceforge.net Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE hamlib-3.0-perl_install.patch -- patch from Fedora Patch0: hamlib-3.0-perl_install.patch -BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: makeinfo @@ -40,10 +39,13 @@ BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(lua) -BuildRequires: pkgconfig(python2) BuildRequires: pkgconfig(tcl) -Requires(post): info -Requires(preun): info +%if 0%{?suse_version} <= 1500 +BuildRequires: fdupes +BuildRequires: pkgconfig(python2) +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} +%endif %description The Ham Radio Control Libraries (Hamlib) provide a programming @@ -86,6 +88,7 @@ Group: Development/Libraries/Other Hamlib provide a programming interface for controlling radios and other shack hardware. +%if 0%{?suse_version} <= 1500 %package -n python-Hamlib Summary: Python bindings for Hamlib Group: Development/Libraries/Python @@ -93,6 +96,7 @@ Group: Development/Libraries/Python %description -n python-Hamlib Hamlib provide a programming interface for controlling radios and other shack hardware. +%endif %package -n tcl-Hamlib Summary: Tcl bindings for Hamlib @@ -121,9 +125,11 @@ autoreconf -fiv --with-perl-binding \ --with-tcl-binding \ --with-lua-binding \ + %if 0%{?suse_version} <= 1500 --with-python-binding \ + %endif --with-xml-support -make %{?_smp_mflags} V=1 +%make_build %install %make_install @@ -134,10 +140,12 @@ rm %{buildroot}%{perl_vendorarch}/auto/Hamlib/.packlist mkdir -p %{buildroot}%{_docdir} mv %{buildroot}/%{_datadir}/doc/%{name} %{buildroot}%{_docdir} +%if 0%{?suse_version} <= 1500 %fdupes %{buildroot}%{python_sitearch} +%endif %check -make %{?_smp_mflags} check +%make_build check %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} @@ -192,11 +200,8 @@ make %{?_smp_mflags} check %files -n lua-Hamliblua %{_libdir}/lua +%if 0%{?suse_version} <= 1500 %files -n python-Hamlib -%if 0%{?suse_version} >= 1330 -%{python2_sitearch}/Hamlib.* -%{python2_sitearch}/_Hamlib.* -%else %{python_sitearch}/Hamlib.* %{python_sitearch}/_Hamlib.* %endif