Hello community, here is the log from the commit of package rfcat for openSUSE:Factory checked in at 2019-04-17 13:31:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rfcat (Old) and /work/SRC/openSUSE:Factory/.rfcat.new.17052 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rfcat" Wed Apr 17 13:31:21 2019 rev:3 rq:695027 version:0.0.0.git1554316953.d960f01 Changes: -------- --- /work/SRC/openSUSE:Factory/rfcat/rfcat.changes 2017-11-09 14:05:32.010203756 +0100 +++ /work/SRC/openSUSE:Factory/.rfcat.new.17052/rfcat.changes 2019-04-17 13:31:25.435640665 +0200 @@ -1,0 +2,27 @@ +Sat Apr 13 12:11:48 UTC 2019 - John Vandenberg <[email protected]> + +- Add avoid-pyside.patch, replacing dependency on python3-pyside2 + with python-qt5 +- Activate test suite + +------------------------------------------------------------------- +Fri Apr 12 12:18:00 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Fix the dependencies. rfcat is preparing for the py3 switch +- Fix a typo, pyside2 is only built for python3 + +------------------------------------------------------------------- +Mon Apr 8 20:52:10 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to version 0.0.0.git1554316953.d960f01: + * Support SRF-Stick from Ciseco + * Enable control of LED during rf activities, for power management + * Fix broken SRF conditional that most likely caused Chronos dongle to break + * addition of 4FSK (hidden feature of the CC1101 radio built into CC1111) + * Migrate ccspecan to PySide2 + * Drop support for Python 2.6 and older + * udev rule cleanup +- Update the dependencies. rfcat master requires PySide2. +- Run spec-cleaner. + +------------------------------------------------------------------- Old: ---- rfcat-0.0.0.git1502127218.53b26b4.tar.xz New: ---- avoid-pyside.patch rfcat-0.0.0.git1554316953.d960f01.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfcat.spec ++++++ --- /var/tmp/diff_new_pack.3qvSPc/_old 2019-04-17 13:31:27.151641492 +0200 +++ /var/tmp/diff_new_pack.3qvSPc/_new 2019-04-17 13:31:27.163641497 +0200 @@ -1,6 +1,7 @@ # # spec file for package rfcat # +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -12,27 +13,43 @@ # 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/ # + %define rfcat_group rfcat Name: rfcat -Version: 0.0.0.git1502127218.53b26b4 +Version: 0.0.0.git1554316953.d960f01 Release: 0 Summary: The swiss army knife of subGHz License: BSD-2-Clause Group: Productivity/Hamradio/Other URL: https://github.com/atlas0fd00m/rfcat +# Refreshed version of https://github.com/3553x/rfcat/commit/8b2ad00da6b25b188b6800aeea3cc811243a8c15.patch +Patch0: avoid-pyside.patch Source: %{name}-%{version}.tar.xz BuildRequires: git-core BuildRequires: pkgconfig BuildRequires: python-devel +BuildRequires: python-future >= 0.17.1 +BuildRequires: python-numpy +BuildRequires: python-qt5 BuildRequires: python-setuptools +BuildRequires: python-usb +# for rfcat_bootloader +BuildRequires: python-pyserial +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) Requires: %{name}-udev +# Unfortunately this isnt automatically detected. +Requires: libusb-1_0-0 +Requires: python-future >= 0.17.1 Requires: python-numpy -Requires: python-pyside +Requires: python-qt5 Requires: python-usb +# for rfcat_bootloader +Requires: python-pyserial BuildArch: noarch %description @@ -45,10 +62,12 @@ Requires(pre): shadow %description udev -Udev rules for rfcat +Udev rules for rfcat. %prep %setup -q +%patch0 -p1 + # Remove files that may be problematic from a license point of view rm -f firmware/cc1111_vcom.c rm -f firmware/cc1111_vcomdesc.c @@ -56,6 +75,23 @@ # HACK: set udev group to rfcat sed -i 's|GROUP="dialout"|GROUP="rfcat"|g' etc/udev/rules.d/20-rfcat.rules +# Loosen pins to allow use of higher version rpms +sed -i 's/==/>=/g' setup.py + +# PySide2 is replaced with qt5 +sed -i '/PySide2>=[0-9.]*/d' setup.py + +# Declared dependency on Python package libusb seems incorrect. +# Likely it refers to system libusb. +# Anyway, that isnt packaged in openSUSE yet, so dont inject it into +# runtime dependencies. +sed -i '/libusb/d' setup.py + +# These are a mix of python and ipython interpreters in the hashbang, +# but residing inside the site-packages and they have relative imports +# making them not executable as-is. +sed -i '1{/#!/d}' rflib/*.py + %build python setup.py build @@ -63,6 +99,11 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} install -Dpm0644 etc/udev/rules.d/20-rfcat.rules %{buildroot}%{_udevrulesdir}/20-rfcat.rules +%check +# use setuptools instead of distutils only during testing. +sed -i 's/distutils.core/setuptools/' setup.py +python setup.py test + %pre udev getent group %{rfcat_group} >/dev/null || groupadd -r %{rfcat_group} @@ -73,14 +114,15 @@ %udev_rules_update %files -%doc LICENSE README.md README.immesniff +%license LICENSE +%doc README.md README.immesniff %{_bindir}/rfcat %{_bindir}/rfcat_bootloader %{_bindir}/rfcat_msfrelay %{_bindir}/rfcat_server %{python_sitelib}/rflib %{python_sitelib}/vstruct -%{python_sitelib}/rfcat-1.0-py%{py_ver}.egg-info +%{python_sitelib}/rfcat-1.0.1-py%{py_ver}.egg-info %files udev %{_udevrulesdir}/20-rfcat.rules ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.3qvSPc/_old 2019-04-17 13:31:27.203641517 +0200 +++ /var/tmp/diff_new_pack.3qvSPc/_new 2019-04-17 13:31:27.207641519 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/atlas0fd00m/rfcat.git</param> - <param name="changesrevision">f65c448587ea651c6ea4f2f1fd3c5433e551347e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">d960f012ab92ae892f83c9f627e97dda231fef34</param></service></servicedata> \ No newline at end of file ++++++ avoid-pyside.patch ++++++ >From 8b2ad00da6b25b188b6800aeea3cc811243a8c15 Mon Sep 17 00:00:00 2001 From: 3553x <[email protected]> Date: Sun, 28 Oct 2018 22:20:22 +0000 Subject: [PATCH] Replace PySide with PyQt5 in ccspecan --- rflib/ccspecan.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) Index: rfcat-0.0.0.git1554316953.d960f01/rflib/ccspecan.py =================================================================== --- rfcat-0.0.0.git1554316953.d960f01.orig/rflib/ccspecan.py +++ rfcat-0.0.0.git1554316953.d960f01/rflib/ccspecan.py @@ -39,13 +39,15 @@ if sys.version_info < (3,): else: import pickle as pickle -from PySide2 import QtCore, QtGui, QtWidgets -from PySide2.QtCore import Qt, QPointF, QLineF +import PyQt5.QtWidgets +from PyQt5 import QtCore, QtGui +from PyQt5.QtCore import Qt, QPointF, QLineF + def ensureQapp(): global _qt_app if not globals().get("_qt_app"): - _qt_app = QtWidgets.QApplication([]) + _qt_app = PyQt5.QtWidgets.QApplication([]) APP_SPECAN = 0x43 @@ -99,9 +101,9 @@ class SpecanThread(threading.Thread): self.join(3.0) self._stopped = True -class RenderArea(QtWidgets.QWidget): +class RenderArea(PyQt5.QtWidgets.QWidget): def __init__(self, data, low_freq=2.400e9, high_freq=2.483e9, freq_step=1e6, delay=0, parent=None): - QtWidgets.QWidget.__init__(self, parent) + PyQt5.QtWidgets.QWidget.__init__(self, parent) self._graph = None self._reticle = None @@ -326,9 +328,9 @@ class RenderArea(QtWidgets.QWidget): delta = tmp * range return self._high_dbm - delta -class Window(QtWidgets.QWidget): +class Window(PyQt5.QtWidgets.QWidget): def __init__(self, data, low_freq, high_freq, spacing, delay=.01, parent=None): - QtWidgets.QWidget.__init__(self, parent) + PyQt5.QtWidgets.QWidget.__init__(self, parent) self._low_freq = low_freq self._high_freq = high_freq @@ -339,7 +341,7 @@ class Window(QtWidgets.QWidget): self.render_area = RenderArea(self._data, low_freq, high_freq, spacing, delay) - main_layout = QtWidgets.QGridLayout() + main_layout = PyQt5.QtWidgets.QGridLayout() main_layout.setContentsMargins(0, 0, 0, 0) main_layout.addWidget(self.render_area, 0, 0) self.setLayout(main_layout) @@ -450,7 +452,7 @@ class Window(QtWidgets.QWidget): print('Unsupported key pressed:', key) if __name__ == '__main__': - app = QtWidgets.QApplication(sys.argv) + app = PyQt5.QtWidgets.QApplication(sys.argv) f = sys.argv[1] fbase = eval(sys.argv[2]) fhigh = eval(sys.argv[3]) ++++++ rfcat-0.0.0.git1502127218.53b26b4.tar.xz -> rfcat-0.0.0.git1554316953.d960f01.tar.xz ++++++ ++++ 3622 lines of diff (skipped)
