Merge branch 'f28' into f27

Merge branch 'f29' into f28
Merge branch 'master' into f28
2018-10-10 12:49:19 +02:00 · 2018-10-10 12:24:00 +02:00 · 2018-08-10 10:03:27 +02:00 · 2018-08-08 13:42:09 +02:00 · 2018-08-08 13:39:43 +02:00 · 2018-08-08 12:48:44 +02:00
2 changed files with 3 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
--- a/2
+++ b/2
@ -1,2 +1,4 @@
+SHA512 (rsyslog-8.37.0.tar.gz) = 2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0
+SHA512 (rsyslog-doc-8.37.0.tar.gz) = 827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59
 SHA512 (rsyslog-8.38.0.tar.gz) = 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
 SHA512 (rsyslog-doc-8.38.0.tar.gz) = e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
Author	SHA1	Message	Date
Jiri Vymazal	8c38936e94	Merge branch 'f28' into f27	2018-10-10 12:49:19 +02: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	ef1208f149	librelp dependency bump	2018-08-08 13:42:09 +02:00
Jiri Vymazal	ade56facf5	Merge branch 'master' into f28	2018-08-08 13:39:43 +02:00
Jiri Vymazal	a032b8a7f6	Merge branch 'f27' of ssh://pkgs.fedoraproject.org/rpms/rsyslog into f27	2018-08-08 12:48:44 +02:00
Jiri Vymazal	3b6595b5ae	rebase to upstream version 8.37.0 resolves: rhbz#1612079 resolves: rhbz#1598217 resolves: rhbz#1544139 dropped needless libee dependency	2018-08-08 12:47:22 +02:00
Jiri Vymazal	78dc3b2a83	fixed a typo in commented-out part of default conf + reordered it resolves: rhbz#1579592	2018-08-08 12:43:37 +02:00
Jiri Vymazal	1e8cce579b	added gcc to buildrequires following f29 system-wide change	2018-08-08 12:39:36 +02:00
Fedora Release Engineering	8f97df78c1	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-08-08 12:39:36 +02:00
Jiri Vymazal	a72c9c407d	removed old unused patch files	2018-08-08 12:39:36 +02:00
Jiri Vymazal	6161c0c9fc	removed unusued patch file	2018-08-08 12:39:36 +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	f788eda2f2	removed old unused patch files	2018-07-02 16:58:09 +02:00
Jiri Vymazal	a06ef6b602	Merge branch 'f28' into f27	2018-07-02 16:57:03 +02:00
Jiri Vymazal	59984bc24f	Merge branch 'master' into f28	2018-07-02 16:55:48 +02:00
Jiri Vymazal	6fd2435cb6	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:37:41 +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	695d95b0f2	Bumped release number	2018-05-17 11:23:19 +02:00
Radovan Sroka	6c3f95e830	Added fmhash.so file	2018-05-17 11:23:12 +02:00
Radovan Sroka	92853018cb	rebase to 8.35.0	2018-05-17 11:23:04 +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
Jiri Vymazal	4f766403ee	Merge branch 'f28' into f27	2018-04-05 13:51:15 +02:00
Jiri Vymazal	c3ae09d37e	Merge branch 'master' into f27	2018-01-12 13:44:44 +01:00
Radovan Sroka	69e718297d	Added also cyrus-sasl-devel dependency	2017-12-14 14:27:12 +01:00
Radovan Sroka	c75de83551	Update to 8.31.0 - removed upstreamed patches - added dependecies mongo-c-driver-devel snappy-devel - removed depricated dependecies libmongo-client - mongodb plugin now uses new driver with TLS,...	2017-12-14 14:26:22 +01:00
Jiri Vymazal	507efa3de7	changed rsyslog-doc to noarch	2017-11-28 13:47:44 +01:00
Radovan Sroka	08a4e12c2e	Rebuild	2017-10-25 13:48:19 +02:00
Radovan Sroka	c7bd68399b	Fixed imjournal module - imjournal didn't work at all - added imjournal patch for rhbz#1505853	2017-10-25 13:37:37 +02:00
Radovan Sroka	3b664f17f8	Rebase to 8.30.0 - added patch that resolves imgssapi compilation errors	2017-10-23 16:46:51 +02:00