Hello community, here is the log from the commit of package librepilot for openSUSE:Factory checked in at 2019-02-04 14:25:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librepilot (Old) and /work/SRC/openSUSE:Factory/.librepilot.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librepilot" Mon Feb 4 14:25:57 2019 rev:2 rq:670999 version:16.09 Changes: -------- --- /work/SRC/openSUSE:Factory/librepilot/librepilot.changes 2017-10-24 22:21:49.640762790 +0200 +++ /work/SRC/openSUSE:Factory/.librepilot.new.28833/librepilot.changes 2019-02-04 14:26:07.817033337 +0100 @@ -1,0 +2,6 @@ +Wed Jan 9 20:21:42 UTC 2019 - adrian@suse.de + +- Fix build on Factory by requiring python<3 +- Cleanup spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librepilot.spec ++++++ --- /var/tmp/diff_new_pack.xAPSSV/_old 2019-02-04 14:26:10.217032199 +0100 +++ /var/tmp/diff_new_pack.xAPSSV/_new 2019-02-04 14:26:10.225032196 +0100 @@ -1,7 +1,7 @@ # # spec file for package librepilot # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,38 +12,39 @@ # 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/ # + Name: librepilot Version: 16.09 Release: 0 Summary: Software to control multicopter and other RC models -License: GPL-3.0 +License: GPL-3.0-only Group: Development/Tools/IDE Url: https://www.librepilot.org Source: %name-%{version}.tar.xz Patch: fix_build_with_qt59.patch %if 0%{?fedora_version} +BuildRequires: python2 BuildRequires: qt5-qtbase-devel BuildRequires: systemd-devel -BuildRequires: python2 %else BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libudev-devel +BuildRequires: python < 3 %endif -BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: SDL-devel +BuildRequires: libusb-devel +BuildRequires: pkgconfig(Qt5MultimediaWidgets) +BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5ScriptTools) +BuildRequires: pkgconfig(Qt5SerialPort) +BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5WebKitWidgets) -BuildRequires: pkgconfig(Qt5OpenGL) -BuildRequires: pkgconfig(Qt5MultimediaWidgets) -BuildRequires: pkgconfig(Qt5SerialPort) -BuildRequires: SDL-devel -BuildRequires: libusb-devel - +BuildRequires: pkgconfig(Qt5Widgets) %description LibrePilot is a software suite to control multicopter and other RC @@ -77,20 +78,23 @@ install -m 0644 ../artwork/Logo/LP_logo_square.png %{buildroot}/usr/share/pixmaps/org.png sed -i -e 's/^Categories=.*/Categories=Building;Development;/' %{buildroot}/usr/share/applications/*desktop -%if "%_libdir" == "/usr/lib64" +%if "%{_lib}" == "lib64" # workaround wrong built in defaults for now -mv %{buildroot}/usr/lib %{buildroot}/usr/lib64 -mkdir -p %{buildroot}/usr/lib -ln -sf ../lib64/gcs %buildroot/usr/lib/gcs +mv %{buildroot}/usr/lib %{buildroot}%{_prefix}/lib64 +mkdir -p %{buildroot}%{_prefix}/lib +ln -sf ../lib64/gcs %buildroot%{_prefix}/lib/gcs %endif %files -%defattr(-,root,root) +%license GPLv3.txt LICENSE.txt +%doc README.md WHATSNEW.txt CREDITS.txt %_bindir/* -%if "%_libdir" == "/usr/lib64" -/usr/lib/gcs +%if "%{_lib}" == "lib64" +%{_prefix}/lib/gcs %endif %_libdir/gcs %_datadir/applications/* %_datadir/pixmaps/* %_datadir/gcs/ + +%changelog