Merge branch 'f29' into f28

Merge branch 'master' into f28
2018-12-05 14:49:04 +01:00 · 2018-10-10 12:24:00 +02:00 · 2018-08-10 10:03:27 +02:00 · 2018-08-08 13:39:43 +02:00 · 2018-08-08 12:36:39 +02:00 · 2018-08-08 12:22:47 +02:00
1 changed files with 1 additions and 1 deletions
--- a/rsyslog.spec
+++ b/rsyslog.spec
@ -31,7 +31,7 @@ BuildRequires: libestr-devel >= 0.1.9
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: pkgconfig
-BuildRequires: python3-docutils
+BuildRequires: python-docutils
 # make sure systemd is in a version that isn't affected by rhbz#974132
 BuildRequires: systemd-devel >= 204-8
 BuildRequires: zlib-devel
Author	SHA1	Message	Date
Jiri Vymazal	d3a6368955	Merge branch 'f29' into f28	2018-12-05 14:49:04 +01:00
Jiri Vymazal	a22653e89c	Merge branch 'f29' into f28	2018-10-10 12:24:00 +02:00
Jiri Vymazal	4c6c191b6f	Merge branch 'master' into f28	2018-08-10 10:03:27 +02:00
Jiri Vymazal	ade56facf5	Merge branch 'master' into f28	2018-08-08 13:39:43 +02:00
Jiri Vymazal	4d31f1884b	reverted python-docutils version	2018-08-08 12:36:39 +02:00
Jiri Vymazal	d3ce0d7f40	Merge branch 'master' into f28	2018-08-08 12:22:47 +02:00
Jiri Vymazal	b31c167618	Merge branch 'master' into f28	2018-08-08 12:19:52 +02:00
Jiri Vymazal	59984bc24f	Merge branch 'master' into f28	2018-07-02 16:55:48 +02:00
Jiri Vymazal	13cce76a20	rebase to 8.36.0 removed stdlog dependency as upstream is going to drop it following upstream naming of pidfile removed needless conditionals	2018-07-02 15:18:38 +02:00
Radovan Sroka	8a36b667d4	Bumped release number	2018-05-17 11:18:00 +02:00
Radovan Sroka	224bceb301	Added fmhash.so file	2018-05-17 11:17:50 +02:00
Radovan Sroka	6b04df01e0	rebase to 8.35.0	2018-05-17 11:00:06 +02:00