From e48447018290f0d2ab2ec76824bb7b015cef2f32 Mon Sep 17 00:00:00 2001
From: zhengxiaoxiao <zhengxiaoxiao2@huawei.com>
Date: Sat, 26 Nov 2022 10:04:32 +0000
Subject: [PATCH] replace openEuler to vendor

Signed-off-by: zhengxiaoxiao <zhengxiaoxiao2@huawei.com>
(cherry picked from commit e6b74963274e5d48c51a83c0a92ef5bbcce3779f)
---
 security-tool.spec | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/security-tool.spec b/security-tool.spec
index 7e1a346..16d19f4 100644
--- a/security-tool.spec
+++ b/security-tool.spec
@@ -1,7 +1,8 @@
+%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
 Summary: openEuler Security Tool
 Name   : security-tool
 Version: 2.0
-Release: 1.84
+Release: 1.85
 Source0: https://gitee.com/openeuler/security-tool/repository/archive/v2.0.tar.gz
 License: MulanPSL-2.0
 URL: https://gitee.com/openeuler/security-tool
@@ -20,7 +21,7 @@ Patch3: fix-function-allow-rpm-q.patch
 Patch4: add-secure-hostKey-algorithms.patch
 
 %description
-openEuler Security Tool
+%{vendor} Security Tool
 
 %global debug_package %{nil}
 
@@ -33,12 +34,12 @@ openEuler Security Tool
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m0700 $RPM_BUILD_ROOT%{_sysconfdir}/openEuler_security
-install -m0600 security $RPM_BUILD_ROOT%{_sysconfdir}/openEuler_security/security
-install -m0400 security.conf $RPM_BUILD_ROOT%{_sysconfdir}/openEuler_security/security.conf
-install -m0600 usr-security.conf $RPM_BUILD_ROOT%{_sysconfdir}/openEuler_security/usr-security.conf
+install -d -m0700 $RPM_BUILD_ROOT%{_sysconfdir}/%{vendor}_security
+install -m0600 security $RPM_BUILD_ROOT%{_sysconfdir}/%{vendor}_security/security
+install -m0400 security.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{vendor}_security/security.conf
+install -m0600 usr-security.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{vendor}_security/usr-security.conf
 install -d -m0755 $RPM_BUILD_ROOT/%{_unitdir}
-install -m0644 openEuler-security.service $RPM_BUILD_ROOT/%{_unitdir}/openEuler-security.service
+install -m0644 %{vendor}-security.service $RPM_BUILD_ROOT/%{_unitdir}/%{vendor}-security.service
 install -d -m0755 $RPM_BUILD_ROOT/%{_sbindir}
 install -m0500 security-tool.sh $RPM_BUILD_ROOT/%{_sbindir}/security-tool.sh
 install -m0644 security-tool-%{version}/csh.precmd $RPM_BUILD_ROOT%{_sysconfdir}/csh.precmd
@@ -69,18 +70,18 @@ else
 fi
 ln -s /etc/pam.d/su-local /etc/pam.d/su
 
-%systemd_post openEuler-security.service
-systemctl enable openEuler-security.service
+%systemd_post %{vendor}-security.service
+systemctl enable %{vendor}-security.service
 
 %preun
-%systemd_preun openEuler-security.service
+%systemd_preun %{vendor}-security.service
 if [ $1 -eq 0 ]
 then
     sed -i 's/password-auth-crond$/system-auth/g' /etc/pam.d/crond
 fi
 
 %postun
-%systemd_postun_with_restart openEuler-security.service
+%systemd_postun_with_restart %{vendor}-security.service
 
 if [ $1 -eq 0 ]
 then
@@ -111,17 +112,20 @@ fi
 
 %files
 %defattr(-,root,root)
-%attr(0700,root,root) %dir %{_sysconfdir}/openEuler_security
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/openEuler_security/security
-%attr(0400,root,root) %config %{_sysconfdir}/openEuler_security/security.conf
-%attr(0600,root,root) %config %{_sysconfdir}/openEuler_security/usr-security.conf
+%attr(0700,root,root) %dir %{_sysconfdir}/%{vendor}_security
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/%{vendor}_security/security
+%attr(0400,root,root) %config %{_sysconfdir}/%{vendor}_security/security.conf
+%attr(0600,root,root) %config %{_sysconfdir}/%{vendor}_security/usr-security.conf
 %attr(0644,root,root) %{_sysconfdir}/csh.precmd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/password-auth-crond
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/su-local
-%attr(0644,root,root) %{_unitdir}/openEuler-security.service
+%attr(0644,root,root) %{_unitdir}/%{vendor}-security.service
 %attr(0500,root,root) %{_sbindir}/security-tool.sh
 
 %changelog
+* Sat Nov 26 2022 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 2.0-1.85
+- replace openEuler to vendor
+
 * Thu Nov 17 2022 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 2.0-1.84
 - replace tar.gz
 
-- 
Gitee