- added split-usr patch (fix bash path in abrtd.service); release 2

diff --git a/abrt-split-usr.patch b/abrt-split-usr.patch
new file mode 100644 (file)
index 0000000..996cf03
--- /dev/null
+++ b/abrt-split-usr.patch
@@ -0,0 +1,11 @@
+--- abrt-2.14.0/init-scripts/abrtd.service.orig        2020-02-07 11:21:43.000000000 +0100
++++ abrt-2.14.0/init-scripts/abrtd.service     2020-03-15 13:56:39.077440120 +0100
+@@ -8,7 +8,7 @@
+ [Service]
+ Type=dbus
+ BusName=org.freedesktop.problems.daemon
+-ExecStartPre=/usr/bin/bash -c "pkill abrt-dbus || :"
++ExecStartPre=/bin/bash -c "pkill abrt-dbus || :"
+ ExecStart=/usr/sbin/abrtd -d -s
+ 
+ [Install]

diff --git a/abrt.spec b/abrt.spec
index 09222a74727a7a46f46db92c79147d5bf755a829..19521e20a756dd784c6c1995c940a229b2656597 100644 (file)
--- a/abrt.spec
+++ b/abrt.spec
@@ -10,7 +10,7 @@ Summary:      Automatic bug detection and reporting tool
 Summary(pl.UTF-8):     Narzędzie do automatycznego wykrywania i zgłaszania błędów
 Name:          abrt
 Version:       2.14.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Applications/System
 #Source0Download: https://github.com/abrt/abrt/releases
@@ -20,6 +20,7 @@ Source1:      %{name}.init
 Patch0:                %{name}-rpm5.patch
 Patch1:                %{name}-rpm45.patch
 Patch2:                %{name}-link.patch
+Patch3:                %{name}-split-usr.patch
 URL:           https://abrt.readthedocs.org/
 BuildRequires: asciidoc
 %{?with_tests:BuildRequires:   augeas}
@@ -412,6 +413,7 @@ się do powłoki.
 %patch1 -p1
 %endif
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} -n -e '/^%%changelog/,$p' abrt.spec.in | tail -n +2 > changelog