Update to v232
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
parent
bada31e4d9
commit
56491111d6
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/python-systemd-*/
|
||||
/python-systemd-230.tar.gz
|
||||
/python-systemd-231.tar.gz
|
||||
/python-systemd-232.tar.gz
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From 3d046016c4ca8860485ab27dd42eaf5bc49872a7 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Herold <m.herold@fu-berlin.de>
|
||||
Date: Thu, 10 Dec 2015 00:18:01 +0100
|
||||
Subject: [PATCH] Fixes Reader.seek_monotonic(datetime.timedelta)
|
||||
|
||||
---
|
||||
systemd/journal.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd/journal.py b/systemd/journal.py
|
||||
index b319a8a..fae7f6f 100644
|
||||
--- a/systemd/journal.py
|
||||
+++ b/systemd/journal.py
|
||||
@@ -291,7 +291,7 @@ def seek_monotonic(self, monotonic, bootid=None):
|
||||
is reference to. Defaults to current bootid.
|
||||
"""
|
||||
if isinstance(monotonic, _datetime.timedelta):
|
||||
- monotonic = monotonic.totalseconds()
|
||||
+ monotonic = monotonic.total_seconds()
|
||||
monotonic = int(monotonic * 1000000)
|
||||
if isinstance(bootid, _uuid.UUID):
|
||||
bootid = bootid.hex
|
||||
@ -1,25 +0,0 @@
|
||||
From 87a9d645500c7adea0bfea34e35562fbdf176054 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Sat, 19 Dec 2015 09:42:49 -0500
|
||||
Subject: [PATCH] test_daemon: Define a default value for SO_PASSCRED
|
||||
|
||||
The socket module seems to be missing this in python2.7.
|
||||
---
|
||||
systemd/test/test_daemon.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
|
||||
index e055048..8c776d5 100644
|
||||
--- a/systemd/test/test_daemon.py
|
||||
+++ b/systemd/test/test_daemon.py
|
||||
@@ -228,7 +228,9 @@ def test_notify_with_socket(tmpdir):
|
||||
path = tmpdir.join('socket').strpath
|
||||
sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
|
||||
sock.bind(path)
|
||||
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_PASSCRED, 1)
|
||||
+ # SO_PASSCRED is not defined in python2.7
|
||||
+ SO_PASSCRED = getattr(socket, 'SO_PASSCRED', 16)
|
||||
+ sock.setsockopt(socket.SOL_SOCKET, SO_PASSCRED, 1)
|
||||
os.environ['NOTIFY_SOCKET'] = path
|
||||
|
||||
assert notify('READY=1') == True
|
||||
@ -1,13 +1,11 @@
|
||||
Name: python-systemd
|
||||
Version: 231
|
||||
Release: 6%{?dist}
|
||||
Version: 232
|
||||
Release: 1%{?dist}
|
||||
Summary: Python module wrapping systemd functionality
|
||||
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/systemd/python-systemd
|
||||
Source0: https://github.com/systemd/python-systemd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Patch0: https://github.com/systemd/python-systemd/commit/3d046016c4ca8860485ab27dd42eaf5bc49872a7.patch
|
||||
Patch1: https://github.com/systemd/python-systemd/commit/87a9d645500c7adea0bfea34e35562fbdf176054.patch
|
||||
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: python2-devel
|
||||
@ -18,14 +16,15 @@ BuildRequires: pytest
|
||||
BuildRequires: python3-pytest
|
||||
|
||||
%global _docdir_fmt %{name}
|
||||
|
||||
%description
|
||||
Python module for native access to the systemd facilities.
|
||||
Functionality includes sending of structured messages to the journal
|
||||
and reading journal files, querying machine and boot identifiers and a
|
||||
lists of message identifiers provided by systemd. Other functionality
|
||||
%global _description \
|
||||
Python module for native access to the systemd facilities. \
|
||||
Functionality includes sending of structured messages to the journal \
|
||||
and reading journal files, querying machine and boot identifiers and a \
|
||||
lists of message identifiers provided by systemd. Other functionality \
|
||||
provided by libsystemd is also wrapped.
|
||||
|
||||
%description %_description
|
||||
|
||||
%package -n python2-systemd
|
||||
Summary: %{summary}
|
||||
|
||||
@ -36,14 +35,7 @@ Obsoletes: systemd-python < 230
|
||||
Conflicts: python3-systemd < %{version}-%{release}
|
||||
Recommends: %{name}-doc
|
||||
|
||||
%description -n python2-systemd
|
||||
Python module for native access to the systemd facilities.
|
||||
Functionality includes sending of structured messages to the journal
|
||||
and reading journal files, querying machine and boot identifiers and a
|
||||
lists of message identifiers provided by systemd. Other functionality
|
||||
provided by libsystemd is also wrapped.
|
||||
|
||||
This is the version for Python 2.
|
||||
%description -n python2-systemd %_description
|
||||
|
||||
%package -n python3-systemd
|
||||
Summary: %{summary}
|
||||
@ -55,14 +47,7 @@ Obsoletes: systemd-python3 < 230
|
||||
Conflicts: python2-systemd < %{version}-%{release}
|
||||
Recommends: %{name}-doc
|
||||
|
||||
%description -n python3-systemd
|
||||
Python module for native access to the systemd facilities.
|
||||
Functionality includes sending of structured messages to the journal
|
||||
and reading journal files, querying machine and boot identifiers and a
|
||||
lists of message identifiers provided by systemd. Other functionality
|
||||
provided by libsystemd is also wrapped.
|
||||
|
||||
This is the version for Python 3.
|
||||
%description -n python3-systemd %_description
|
||||
|
||||
%package doc
|
||||
Summary: HTML documentation for %{name}
|
||||
@ -92,25 +77,30 @@ cp -p README.md NEWS %{buildroot}%{_pkgdocdir}/
|
||||
# if the socket is not there, skip doc tests
|
||||
test -f /run/systemd/journal/stdout || \
|
||||
sed -i 's/--doctest[^ ]*//g' pytest.ini
|
||||
make PYTHON=%{__python2} check || :
|
||||
make PYTHON=%{__python3} check || :
|
||||
make PYTHON=%{__python2} check
|
||||
make PYTHON=%{__python3} check
|
||||
|
||||
%files -n python2-systemd
|
||||
%license LICENSE.txt
|
||||
%doc %{_pkgdocdir}
|
||||
%exclude %{_pkgdocdir}/html
|
||||
%{python2_sitearch}/*
|
||||
%{python2_sitearch}/systemd/
|
||||
%{python2_sitearch}/systemd_python*.egg-info
|
||||
|
||||
%files -n python3-systemd
|
||||
%license LICENSE.txt
|
||||
%doc %{_pkgdocdir}
|
||||
%exclude %{_pkgdocdir}/html
|
||||
%{python3_sitearch}/*
|
||||
%{python3_sitearch}/systemd/
|
||||
%{python3_sitearch}/systemd_python*.egg-info
|
||||
|
||||
%files doc
|
||||
%doc %{_pkgdocdir}/html
|
||||
|
||||
%changelog
|
||||
* Thu Sep 22 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 232-1
|
||||
- Update to latest version
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 231-6
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user