diff --git a/rpm/security-benchmark.spec b/rpm/security-benchmark.spec index f934df44941858f3f42784b66c222d7682a63cf7..b55aa5d6a05e19d7ebab7d8809b8a985a47f71d3 100644 --- a/rpm/security-benchmark.spec +++ b/rpm/security-benchmark.spec @@ -1,6 +1,5 @@ -%define version 1.3.0 -%define anolis_release 1 -%define BIN_DIR /usr/local +%define version v1.3.0 +%define anolis_release 2 Name: security-benchmark Version: %{version} @@ -10,7 +9,7 @@ Group: Development/Tools License: MulanPSL-2.0 URL: https://gitee.com/anolis/security-benchmark -Source: %{name}-v%{version}.tar.gz +Source: %{name}-%{version}.tar.gz BuildArch: noarch @@ -21,28 +20,33 @@ Security-benchmark home: https://gitee.com/anolis/security-benchmark Download address of release 1.3.0: https://gitee.com/anolis/security-benchmark/archive/refs/tags/v1.3.0.tar.gz %prep -%setup -c -n /root/rpmbuild/BUILD +%setup -q + +%build %install -rm -rf $RPM_BUILD_ROOT -install -d -p %{buildroot}%{BIN_DIR}/%{name}/tools/scanners -install -d -p %{buildroot}%{BIN_DIR}/%{name}/tools/remediation-kits -install -d -p %{buildroot}%{BIN_DIR}/%{name}/scanners -install -d -p %{buildroot}%{BIN_DIR}/%{name}/remediation-kits +install -d -p %{buildroot}%{_datadir}/%{name}/tools/scanners +install -d -p %{buildroot}%{_datadir}/%{name}/tools/remediation-kits +install -d -p %{buildroot}%{_datadir}/%{name}/scanners +install -d -p %{buildroot}%{_datadir}/%{name}/remediation-kits -cp -a %{_topdir}/BUILD/%{name}-v%{version}/tools/scanners %{buildroot}%{BIN_DIR}/%{name}/tools -cp -a %{_topdir}/BUILD/%{name}-v%{version}/tools/remediation-kits %{buildroot}%{BIN_DIR}/%{name}/tools -cp -a %{_topdir}/BUILD/%{name}-v%{version}/scanners %{buildroot}%{BIN_DIR}/%{name} -cp -a %{_topdir}/BUILD/%{name}-v%{version}/remediation-kits %{buildroot}%{BIN_DIR}/%{name} +cp -a tools/scanners %{buildroot}%{_datadir}/%{name}/tools +cp -a tools/remediation-kits %{buildroot}%{_datadir}/%{name}/tools +cp -a scanners %{buildroot}%{_datadir}/%{name} +cp -a remediation-kits %{buildroot}%{_datadir}/%{name} %files %defattr (-,root,root,0755) -%{BIN_DIR}/%{name}/tools/scanners -%{BIN_DIR}/%{name}/tools/remediation-kits -%{BIN_DIR}/%{name}/scanners -%{BIN_DIR}/%{name}/remediation-kits +%license LICENSE +%{_datadir}/%{name}/tools/scanners +%{_datadir}/%{name}/tools/remediation-kits +%{_datadir}/%{name}/scanners +%{_datadir}/%{name}/remediation-kits %changelog +* Tue Apr 4 2023 Yilin Li - 1.3.0-2 +- fix some bugs and change to install in %{_datadir}. + * Mon Apr 3 2023 Yuqing Yang - 1.3.0-1 - Updated version. @@ -50,4 +54,4 @@ cp -a %{_topdir}/BUILD/%{name}-v%{version}/remediation-kits %{buildroot}%{BIN_DI - Add Requires bc. * Wed Mar 29 2023 Yuqing Yang - 1.2.0-1 -- Init package. \ No newline at end of file +- Init package.