Skip to content

Commit 37fc419

Browse files
committed
fix: spec: %files reorder, do not use exclude
It is better to list files explicitly. Order bin, then man. Move oscap-run-sce-script to engine-sce.
1 parent 493b43a commit 37fc419

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

openscap.spec

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,11 @@ ln -sf ../oscap-remediate.service %{buildroot}%{_unitdir}/system-update.target.w
202202
%{_includedir}/openscap
203203
%exclude %{_includedir}/openscap/sce_engine_api.h
204204

205-
%files engine-sce-devel
206-
%{_libdir}/libopenscap_sce.so
207-
%{_includedir}/openscap/sce_engine_api.h
208-
209205
%files scanner
210-
%{_mandir}/man8/oscap.8*
211206
%{_bindir}/oscap
212207
%{_bindir}/oscap-chroot
208+
%{_mandir}/man8/oscap.8*
209+
%{_mandir}/man8/oscap-chroot.8*
213210
%{_sysconfdir}/bash_completion.d
214211
%{_libexecdir}/oscap-remediate
215212
%{_unitdir}/oscap-remediate.service
@@ -219,23 +216,31 @@ ln -sf ../oscap-remediate.service %{buildroot}%{_unitdir}/system-update.target.w
219216

220217
%files utils
221218
%doc docs/oscap-scan.cron
222-
%{_mandir}/man8/*
223-
%exclude %{_mandir}/man8/oscap.8*
224-
%exclude %{_mandir}/man8/oscap-docker.8*
225-
%{_bindir}/*
226-
%exclude %{_bindir}/oscap
227-
%exclude %{_bindir}/oscap-docker
228-
%exclude %{_bindir}/oscap-chroot
219+
%{_bindir}/autotailor
220+
%{_bindir}/oscap-remediate-offline
221+
%{_bindir}/oscap-ssh
222+
%{_bindir}/oscap-vm
223+
%{_bindir}/scap-as-rpm
224+
%{_mandir}/man8/autotailor.8*
225+
%{_mandir}/man8/oscap-remediate-offline.8*
226+
%{_mandir}/man8/oscap-ssh.8*
227+
%{_mandir}/man8/oscap-vm.8*
228+
%{_mandir}/man8/scap-as-rpm.8*
229229

230230
%files engine-sce
231+
%{_bindir}/oscap-run-sce-script
231232
%{_libdir}/libopenscap_sce.so.*
232233

234+
%files engine-sce-devel
235+
%{_libdir}/libopenscap_sce.so
236+
%{_includedir}/openscap/sce_engine_api.h
237+
233238
%files containers
234239
%{_bindir}/oscap-docker
235240
%{_mandir}/man8/oscap-docker.8*
236-
%{python3_sitelib}/oscap_docker_python/*
237241
%{_bindir}/oscap-podman
238242
%{_mandir}/man8/oscap-podman.8*
243+
%{python3_sitelib}/oscap_docker_python/*
239244

240245
%changelog
241246
%autochangelog

0 commit comments

Comments
 (0)