From 201e24e6e090993d46ed4131c383314982a39660 Mon Sep 17 00:00:00 2001
From: STorresi <>
Date: Dec 09 2020 21:23:25 +0000
Subject: Update loki to version 2.0.0+git.1603727260.6978ee5d / rev 2 via SR 854273


https://build.opensuse.org/request/show/854273
by user STorresi + dimstar_suse

---

diff --git a/.files b/.files
index b63c64a..607d1d8 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 157f4aa..afe4ddb 100644
--- a/.rev
+++ b/.rev
@@ -7,4 +7,12 @@
     <comment>New package for the Loki log aggregator.</comment>
     <requestid>849378</requestid>
   </revision>
+  <revision rev="2" vrev="2">
+    <srcmd5>0c37ed134262bd187d773a0332dc8b2c</srcmd5>
+    <version>2.0.0+git.1603727260.6978ee5d</version>
+    <time>1607548942</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>854273</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
new file mode 100644
index 0000000..f4041ef
--- /dev/null
+++ b/.servicemark
@@ -0,0 +1 @@
+282c1949703925df9b04553663cb2eab
diff --git a/loki.changes b/loki.changes
index cf7d554..3d4c2ee 100644
--- a/loki.changes
+++ b/loki.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Dec  8 23:05:04 UTC 2020 - Bogdano Arendartchuk <BArendartchuk@suse.com>
+
+- .service: Fix CONFIG_FILE to expand mid-word
+
+-------------------------------------------------------------------
 Mon Nov  9 13:15:42 UTC 2020 - Stefano Torresi <stefano.torresi@suse.com>
 
 - Update packaging
diff --git a/loki.service b/loki.service
index 63b5bc9..a46a978 100644
--- a/loki.service
+++ b/loki.service
@@ -6,7 +6,7 @@ Documentation=https://github.com/grafana/loki
 Restart=always
 User=loki
 EnvironmentFile=-/etc/sysconfig/loki
-ExecStart=/usr/bin/loki -config.file=$CONFIG_FILE
+ExecStart=/usr/bin/loki -config.file=${CONFIG_FILE}
 ExecReload=/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s
 SendSIGKILL=no
diff --git a/loki.spec b/loki.spec
index 3954de7..6ab68d2 100644
--- a/loki.spec
+++ b/loki.spec
@@ -15,24 +15,25 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 Name:           loki
 Version:        2.0.0+git.1603727260.6978ee5d
 Release:        0
 Summary:        Loki: like Prometheus, but for logs.
 License:        Apache-2.0
 Group:          System/Monitoring
-Url:            https://grafana.com/loki
+URL:            https://grafana.com/loki
 Source:         %{name}-%{version}.tar.bz2
 Source1:        loki.service
 Source2:        promtail.service
 Source3:        sysconfig.loki
 Source4:        sysconfig.promtail
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  golang(API) >= 1.13
 BuildRequires:  golang-packaging
 BuildRequires:  systemd-devel
-Requires:       user(loki)
+BuildRequires:  golang(API) >= 1.13
 Requires:       group(loki)
+Requires:       user(loki)
 Requires(post): %fillup_prereq
 %systemd_ordering
 
@@ -58,7 +59,6 @@ go build -ldflags="$GOLDFLAGS" ./cmd/loki
 go build -ldflags="$GOLDFLAGS" ./cmd/logcli
 CGO_ENABLED=1 go build -ldflags="$GOLDFLAGS" ./cmd/promtail
 
-
 %install
 
 # Service files for Loki and promtail
diff --git a/promtail.service b/promtail.service
index fe04f12..f0cb7d2 100644
--- a/promtail.service
+++ b/promtail.service
@@ -6,7 +6,7 @@ Documentation=https://github.com/grafana/loki/blob/master/docs/promtail.md
 Restart=always
 User=loki
 EnvironmentFile=-/etc/sysconfig/promtail
-ExecStart=/usr/bin/promtail -config.file=$CONFIG_FILE
+ExecStart=/usr/bin/promtail -config.file=${CONFIG_FILE}
 ExecReload=/bin/kill -HUP $MAINPID
 TimeoutStopSec=20s
 SendSIGKILL=no