From fd2bb8927cc8288bb6494f945abcdd67883f0905 Mon Sep 17 00:00:00 2001
From: Manuel Sabban <github@sabban.eu>
Date: Fri, 15 Mar 2024 14:36:34 +0100
Subject: [PATCH] Fix rpm build (#2894)

* fix rpm build
---
 rpm/SOURCES/crowdsec.unit.patch | 15 ---------------
 rpm/SPECS/crowdsec.spec         |  6 ++----
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 rpm/SOURCES/crowdsec.unit.patch

diff --git a/rpm/SOURCES/crowdsec.unit.patch b/rpm/SOURCES/crowdsec.unit.patch
deleted file mode 100644
index 5173beb27..000000000
--- a/rpm/SOURCES/crowdsec.unit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/crowdsec.service-orig	2022-03-24 09:46:16.581681532 +0000
-+++ config/crowdsec.service	2022-03-24 09:46:28.761681532 +0000
-@@ -5,8 +5,8 @@
- [Service]
- Type=notify
- Environment=LC_ALL=C LANG=C
--ExecStartPre=/usr/local/bin/crowdsec -c /etc/crowdsec/config.yaml -t -error
--ExecStart=/usr/local/bin/crowdsec -c /etc/crowdsec/config.yaml
-+ExecStartPre=/usr/bin/crowdsec -c /etc/crowdsec/config.yaml -t -error
-+ExecStart=/usr/bin/crowdsec -c /etc/crowdsec/config.yaml
- #ExecStartPost=/bin/sleep 0.1
--ExecReload=/usr/local/bin/crowdsec -c /etc/crowdsec/config.yaml -t -error
-+ExecReload=/usr/bin/crowdsec -c /etc/crowdsec/config.yaml -t -error
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=always
diff --git a/rpm/SPECS/crowdsec.spec b/rpm/SPECS/crowdsec.spec
index f14df9325..60884dfd4 100644
--- a/rpm/SPECS/crowdsec.spec
+++ b/rpm/SPECS/crowdsec.spec
@@ -8,8 +8,7 @@ License:        MIT
 URL:            https://crowdsec.net
 Source0:        https://github.com/crowdsecurity/%{name}/archive/v%(echo $VERSION).tar.gz
 Source1:        80-%{name}.preset
-Patch0:         crowdsec.unit.patch
-Patch1:         user.patch
+Patch0:         user.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  systemd
@@ -32,7 +31,6 @@ Requires: crontabs
 %setup -q -T -b 0
 
 %patch0
-%patch1
 
 %build
 sed -i "s#/usr/local/lib/crowdsec/plugins/#%{_libdir}/%{name}/plugins/#g" config/config.yaml
@@ -53,7 +51,7 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/plugins/
 install -m 755 -D cmd/crowdsec/crowdsec %{buildroot}%{_bindir}/%{name}
 install -m 755 -D cmd/crowdsec-cli/cscli %{buildroot}%{_bindir}/cscli
 install -m 755 -D wizard.sh %{buildroot}/usr/share/crowdsec/wizard.sh
-install -m 644 -D config/crowdsec.service %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 -D debian/crowdsec.service %{buildroot}%{_unitdir}/%{name}.service
 install -m 644 -D config/patterns/* -t %{buildroot}%{_sysconfdir}/crowdsec/patterns
 install -m 600 -D config/config.yaml %{buildroot}%{_sysconfdir}/crowdsec
 install -m 644 -D config/simulation.yaml %{buildroot}%{_sysconfdir}/crowdsec