Skip to content

Commit 29e430d

Browse files
luigifabluigifab
committed
Version 1.2.4
1 parent dc74724 commit 29e430d

14 files changed

Lines changed: 113 additions & 53 deletions

File tree

‎README.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,20 @@ pub rsa4096 2020-10-31 [SC]
7272

7373
## Copyright
7474

75-
- Current version: 1.2.3 (10/10/2023)
75+
- Current version: 1.2.4 (02/02/2024)
7676
- Compatibility: Python 3.3 / 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 / 3.10 / 3.11 / 3.12
77-
- Links: [luigifab.fr](https://www.luigifab.fr/python/radexreader) - [github.com](https://github.com/luigifab/python-radexreader) - [pypi.org](https://pypi.org/project/radexreader/)\
78-
[Debian python-radexreader.deb](https://packages.debian.org/python3-radexreader)\
77+
- Links: [luigifab.fr](https://www.luigifab.fr/python/radexreader) - [github.com](https://github.com/luigifab/python-radexreader) - [PyPI](https://pypi.org/project/radexreader/)\
78+
[Arch Linux python-radexreader.zst](https://aur.archlinux.org/packages/python-radexreader)\
79+
[Debian python-radexreader.deb](https://packages.debian.org/python3-radexreader)
80+
*([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973447),
81+
[RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974217))*\
7982
[Fedora python-radexreader.rpm](https://src.fedoraproject.org/rpms/python-radexreader)\
8083
[openSUSE python-radexreader.rpm](https://software.opensuse.org/package/python-radexreader)\
8184
[Ubuntu PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
8285

8386
This program is provided under the terms of the **GNU GPLv2+** license.\
8487
If you like, take some of your time to improve some translations, go to https://bit.ly/2HyCCEc.
88+
89+
## Packages in official distros repositories
90+
91+
[![Packages status](https://repology.org/badge/vertical-allrepos/python:radexreader.svg?header=radexreader)](https://repology.org/project/python:radexreader/versions)

‎archlinux/PKGBUILD‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
pkgname=python-radexreader
2+
pkgver=1.2.4
3+
pkgrel=1
4+
pkgdesc="Reader for the RADEX RD1212 and ONE Geiger counters"
5+
arch=('any')
6+
url='https://github.com/luigifab/python-radexreader'
7+
license=('GPL2')
8+
depends=('python-pyusb' 'python-pyserial')
9+
makedepends=('python-setuptools')
10+
source=("https://github.com/luigifab/python-radexreader/archive/v${pkgver}/python-radexreader-${pkgver}.tar.gz")
11+
md5sums=("...")
12+
13+
prepare() {
14+
cd "$pkgname-$pkgver"
15+
sed -i 's/python3-radexreader /python3-radexreader-zst /g' src/radexreader.py
16+
sed -i 's/\#\!\/usr\/bin\/python3/\#/g' src/radexreader/__init__.py
17+
}
18+
19+
build() {
20+
cd "$pkgname-$pkgver/src"
21+
python setup.py build
22+
}
23+
24+
package() {
25+
cd "$pkgname-$pkgver/src"
26+
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
27+
28+
mkdir -p "$pkgdir/usr/bin/"
29+
install -pm 755 radexreader.py "$pkgdir/usr/bin/"
30+
31+
mkdir -p "$pkgdir/usr/share/doc/$pkgname/"
32+
install -pm 644 ../README.md "$pkgdir/usr/share/doc/$pkgname/"
33+
34+
mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
35+
install -pm 644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/"
36+
37+
mkdir -p "$pkgdir/usr/share/man/man1/" "$pkgdir/usr/share/man/fr/man1/"
38+
install -pm 644 ../debian/radexreader.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
39+
install -pm 644 ../debian/radexreader.fr.1 "$pkgdir/usr/share/man/fr/man1/$pkgname.1"
40+
41+
mkdir -p "$pkgdir/usr/lib/udev/rules.d/"
42+
install -pm 644 ../debian/udev "$pkgdir/usr/lib/udev/rules.d/60-$pkgname.rules"
43+
}

‎debian/changelog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
python-radexreader (1.2.3-1) experimental; urgency=low
1+
python-radexreader (1.2.4-1) experimental; urgency=low
22

33
* Initial Debian package release (Closes: #973447)
44

5-
-- Fabrice Creuzot <code@luigifab.fr> Tue, 10 Oct 2023 20:00:00 +0000
5+
-- Fabrice Creuzot <code@luigifab.fr> Fri, 02 Feb 2024 20:00:00 +0000

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Priority: optional
44
Maintainer: Fabrice Creuzot <code@luigifab.fr>
55
Build-Depends: debhelper-compat (= 13), python3-all, dh-python, dh-exec
66
Rules-Requires-Root: no
7-
Standards-Version: 4.6.1.0
7+
Standards-Version: 4.6.2
88
Homepage: https://github.com/luigifab/python-radexreader
99
Vcs-Browser: https://github.com/luigifab/python-radexreader
1010
Vcs-Git: https://github.com/luigifab/python-radexreader.git

‎debian/copyright‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Source: https://github.com/luigifab/python-radexreader
33
Upstream-Contact: Fabrice Creuzot <code@luigifab.fr>
44

55
Files: *
6-
Copyright: 2020-2023 Fabrice Creuzot (luigifab) <code@luigifab.fr>
6+
Copyright: 2020-2024 Fabrice Creuzot (luigifab) <code@luigifab.fr>
77
License: GPL-2+
88

99
License: GPL-2+

‎debian/deb.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44

55
cd "$(dirname "$0")"
6-
version="1.2.3"
6+
version="1.2.4"
77

88

9-
rm -rf builder/
109
mkdir builder
10+
rm -rf builder/*
1111

1212
# copy to a tmp directory
1313
if [ true ]; then
@@ -31,10 +31,10 @@ fi
3131

3232

3333
# create packages for Debian and Ubuntu
34-
for serie in experimental mantic lunar jammy focal bionic xenial trusty; do
34+
for serie in experimental noble mantic jammy focal bionic xenial trusty; do
3535

3636
if [ $serie = "experimental" ]; then
37-
# for Ubuntu
37+
# copy for Ubuntu
3838
cp -a builder/python-radexreader-$version/ builder/python-radexreader-$version+src/
3939
# Debian only
4040
cd builder/python-radexreader-$version/

‎fedora/python-radexreader.spec‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Pour éviter un Access denied (insufficient permissions), n'oubliez pas
1818
de débrancher l'appareil après l'installation.}
1919

2020
Name: python-radexreader
21-
Version: 1.2.3
21+
Version: 1.2.4
2222
Release: 1%{?dist}
2323
Summary: %{common_summary_en}
2424
Summary(fr): %{common_summary_fr}
@@ -61,12 +61,14 @@ cd src
6161
cd src
6262
%py3_install
6363
mkdir -p %{buildroot}%{_bindir}/
64-
mkdir -p %{buildroot}/lib/udev/rules.d/
64+
install -pm 755 radexreader.py %{buildroot}%{_bindir}/radexreader
65+
6566
mkdir -p %{buildroot}%{_mandir}/man1/ %{buildroot}%{_mandir}/fr/man1/
66-
install -p -m 755 ../src/radexreader.py %{buildroot}%{_bindir}/radexreader
67-
install -p -m 644 ../debian/radexreader.1 %{buildroot}%{_mandir}/man1/radexreader.1
68-
install -p -m 644 ../debian/radexreader.fr.1 %{buildroot}%{_mandir}/fr/man1/radexreader.1
69-
install -p -m 644 ../debian/udev %{buildroot}/lib/udev/rules.d/60-python3-radexreader.rules
67+
install -pm 644 ../debian/radexreader.1 %{buildroot}%{_mandir}/man1/radexreader.1
68+
install -pm 644 ../debian/radexreader.fr.1 %{buildroot}%{_mandir}/fr/man1/radexreader.1
69+
70+
mkdir -p %{buildroot}/lib/udev/rules.d/
71+
install -pm 644 ../debian/udev %{buildroot}/lib/udev/rules.d/60-%{name}.rules
7072

7173
%files -n python3-radexreader
7274
%license LICENSE
@@ -76,10 +78,13 @@ install -p -m 644 ../debian/udev %{buildroot}/lib/udev/rules.d/60-python3-radexr
7678
%{_bindir}/radexreader
7779
%{_mandir}/man1/radexreader.1*
7880
%{_mandir}/*/man1/radexreader.1*
79-
/lib/udev/rules.d/60-python3-radexreader.rules
81+
/lib/udev/rules.d/60-%{name}.rules
8082

8183

8284
%changelog
85+
* Fri Feb 02 2024 Fabrice Creuzot <code@luigifab.fr> - 1.2.4-1
86+
- New upstream release
87+
8388
* Tue Oct 10 2023 Fabrice Creuzot <code@luigifab.fr> - 1.2.3-1
8489
- New upstream release
8590

‎fedora/rpm.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
44

55
cd "$(dirname "$0")"
6-
version="1.2.3"
6+
version="1.2.4"
77

88

9-
rm -rf builder/
109
mkdir -p builder ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
10+
find builder/* ! -name "*$version*.rpm" ! -name "*$version*.gz" -exec rm -rf {} + 2>/dev/null
1111

1212
# copy to a tmp directory
1313
if [ true ]; then
@@ -20,7 +20,7 @@ else
2020
rm -rf /tmp/$temp/*/builder/ /tmp/$temp/radexreader/__pycache__/
2121

2222
mv /tmp/$temp builder/
23-
cp /usr/share/licenses/linux-firmware/GPL-2 builder/$temp/LICENSE
23+
cp /usr/share/licenses/*-firmware/GPL-2 builder/$temp/LICENSE # * = linux
2424

2525
cd builder/
2626
tar czf $temp.tar.gz $temp
@@ -32,10 +32,10 @@ fi
3232

3333
# create package (rpm sign https://access.redhat.com/articles/3359321)
3434
rpmbuild -ba python-radexreader.spec
35-
rpm --addsign ~/rpmbuild/RPMS/*/*.rpm
36-
rpm --addsign ~/rpmbuild/SRPMS/*.rpm
37-
mv ~/rpmbuild/RPMS/*/*.rpm builder/
38-
mv ~/rpmbuild/SRPMS/*.rpm builder/
35+
rpm --addsign ~/rpmbuild/RPMS/*/python*radexreader*.rpm
36+
rpm --addsign ~/rpmbuild/SRPMS/python*radexreader*.rpm
37+
mv ~/rpmbuild/RPMS/*/python*radexreader*.rpm builder/
38+
mv ~/rpmbuild/SRPMS/python*radexreader*.rpm builder/
3939
echo "==========================="
4040
rpm --checksig builder/*.rpm
4141
echo "==========================="

‎opensuse/python-radexreader.spec‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
22
Name: python-radexreader
3-
Version: 1.2.3
3+
Version: 1.2.4
44
Release: 0
55
Summary: Reader for the RADEX RD1212 and ONE Geiger counters
66
License: GPL-2.0-or-later
@@ -45,23 +45,23 @@ cd src
4545
mkdir -p %{buildroot}%{_bindir}/
4646
mkdir -p %{buildroot}%{_mandir}/man1/ %{buildroot}%{_mandir}/fr/man1/
4747
mkdir -p %{buildroot}%{_udevrulesdir}/
48-
install -p -m 755 ../src/radexreader.py %{buildroot}%{_bindir}/radexreader
49-
install -p -m 644 ../debian/radexreader.1 %{buildroot}%{_mandir}/man1/radexreader.1
50-
install -p -m 644 ../debian/radexreader.fr.1 %{buildroot}%{_mandir}/fr/man1/radexreader.1
51-
%python_expand install -p -m 644 ../debian/udev %{buildroot}%{_udevrulesdir}/60-python%{$python_bin_suffix}-radexreader.rules
48+
install -pm 755 radexreader.py %{buildroot}%{_bindir}/radexreader
49+
install -pm 644 ../debian/radexreader.1 %{buildroot}%{_mandir}/man1/radexreader.1
50+
install -pm 644 ../debian/radexreader.fr.1 %{buildroot}%{_mandir}/fr/man1/radexreader.1
5251
%python_clone -a %{buildroot}%{_bindir}/radexreader
5352
%python_clone -a %{buildroot}%{_mandir}/man1/radexreader.1
5453
%python_clone -a %{buildroot}%{_mandir}/fr/man1/radexreader.1
54+
%python_expand install -pm 644 ../debian/udev %{buildroot}%{_udevrulesdir}/60-python%{$python_bin_suffix}-radexreader.rules
5555

5656
%files %{python_files}
5757
%license LICENSE
5858
%doc README.md
5959
%{python_sitelib}/radexreader/
6060
%{python_sitelib}/radexreader*egg-info/
61-
%{_udevrulesdir}/60-python%{python_bin_suffix}-radexreader.rules
6261
%python_alternative %{_bindir}/radexreader
6362
%python_alternative %{_mandir}/man1/radexreader.1%{?ext_man}
6463
%python_alternative %{_mandir}/fr/man1/radexreader.1%{?ext_man}
64+
%{_udevrulesdir}/60-python%{python_bin_suffix}-radexreader.rules
6565

6666
%post
6767
%{python_install_alternative radexreader radexreader.1}
@@ -71,6 +71,9 @@ install -p -m 644 ../debian/radexreader.fr.1 %{buildroot}%{_mandir}/fr/man1/rade
7171

7272

7373
%changelog
74+
* Fri Feb 02 2024 Fabrice Creuzot <code@luigifab.fr> - 1.2.4-1
75+
- New upstream release
76+
7477
* Tue Oct 10 2023 Fabrice Creuzot <code@luigifab.fr> - 1.2.3-1
7578
- New upstream release
7679

‎opensuse/rpm.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44

55
cd "$(dirname "$0")"
6-
version="1.2.3"
6+
version="1.2.4"
77

88

9-
rm -rf builder/
109
mkdir -p builder ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
10+
find builder/* ! -name "*$version*.rpm" ! -name "*$version*.gz" -exec rm -rf {} + 2>/dev/null
1111

1212
# copy to a tmp directory
1313
if [ true ]; then
@@ -20,7 +20,7 @@ else
2020
rm -rf /tmp/$temp/*/builder/ /tmp/$temp/radexreader/__pycache__/
2121

2222
mv /tmp/$temp builder/
23-
cp /usr/share/licenses/kernel-firmware/GPL-2 builder/$temp/LICENSE
23+
cp /usr/share/licenses/*-firmware/GPL-2 builder/$temp/LICENSE # * = kernel
2424

2525
cd builder/
2626
tar czf $temp.tar.gz $temp
@@ -32,10 +32,10 @@ fi
3232

3333
# create package (rpm sign https://access.redhat.com/articles/3359321)
3434
rpmbuild -ba python-radexreader.spec
35-
rpm --addsign ~/rpmbuild/RPMS/*/*.rpm
36-
rpm --addsign ~/rpmbuild/SRPMS/*.rpm
37-
mv ~/rpmbuild/RPMS/*/*.rpm builder/
38-
mv ~/rpmbuild/SRPMS/*.rpm builder/
35+
rpm --addsign ~/rpmbuild/RPMS/*/python*radexreader*.rpm
36+
rpm --addsign ~/rpmbuild/SRPMS/python*radexreader*.rpm
37+
mv ~/rpmbuild/RPMS/*/python*radexreader*.rpm builder/
38+
mv ~/rpmbuild/SRPMS/python*radexreader*.rpm builder/
3939
echo "==========================="
4040
rpm --checksig builder/*.rpm
4141
echo "==========================="

0 commit comments

Comments
 (0)