- update config marker to 3.7; move json configs to json pkg

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 512504195cd89800fd329464a443b2bfe4a860a2..860949386985cdc27d7c21f7298e2555fa37edc2 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.6
+@version: 3.7
 @include "scl.conf"
 #
 # Syslog-ng configuration for PLD Linux

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 783547c869a29a4c19f655dc205e15473e828c7f..373be940ef684e3e5af98ad63cca15939e26b6ae 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -502,7 +502,6 @@ exit 0
 
 %dir %{_datadir}/syslog-ng/include
 %dir %{_datadir}/syslog-ng/include/scl
-%{_datadir}/syslog-ng/include/scl/cim
 %{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/hdfs
 %dir %{_datadir}/syslog-ng/include/scl/graphite
@@ -570,6 +569,7 @@ exit 0
 %files module-json-plugin
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/libjson-plugin.so
+%{_datadir}/syslog-ng/include/scl/cim
 %endif
 
 %if %{with redis}