testing/systemd-rpm-macros
SHA256
3
0
Fork 0
forked from pool/systemd-rpm-macros
Code Pull Requests Activity

- Make rpmbuild load our own macros.systemd to import %{%_unitdir} properly

Browse Source 
Ideally we should also own other %{_*dir} paths...
- Bump version to 5

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=43
This commit is contained in:
Franck Bui 2020-11-09 07:15:43 +00:00 committed by Git OBS Bridge
parent 6873a04f30
commit fe75626308
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
systemd-rpm-macros.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Nov 9 07:35:12 UTC 2020 - Franck Bui <fbui@suse.com>
- Make rpmbuild load our own macros.systemd to import %{%_unitdir} properly
Ideally we should also own other %{_*dir} paths...
- Stop owning /usr/lib/systemd directory as no package other than
systemd is supposed to put files there.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 2 14:36:43 UTC 2020 - Franck Bui <fbui@suse.com> Mon Nov 2 14:36:43 UTC 2020 - Franck Bui <fbui@suse.com>
@ -7,6 +17,11 @@ Mon Nov 2 14:36:43 UTC 2020 - Franck Bui <fbui@suse.com>
used by packages that need to prevent theirs services from being used by packages that need to prevent theirs services from being
restarted. restarted.
-------------------------------------------------------------------
Fri Oct 30 17:39:01 UTC 2020 - Franck Bui <fbui@suse.com>
- Bump version to 5
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 30 17:37:54 UTC 2020 - Franck Bui <fbui@suse.com> Fri Oct 30 17:37:54 UTC 2020 - Franck Bui <fbui@suse.com>

12
systemd-rpm-macros.spec
View File

@ -30,6 +30,9 @@ BuildArch: noarch
#!BuildIgnore: util-linux #!BuildIgnore: util-linux
#!BuildIgnore: %{name} #!BuildIgnore: %{name}
# We need our own definition of %{_unitdir}.
%{?load:%{S0}}
%description %description
Starting with openSUSE 12.1, several RPM macros must be used to package systemd Starting with openSUSE 12.1, several RPM macros must be used to package systemd
services files. This package provides these macros. services files. This package provides these macros.
@ -40,14 +43,11 @@ services files. This package provides these macros.
%install %install
install -Dm644 %{S:0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.systemd install -Dm644 %{S:0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.systemd
UNITDIR="$(sed -n 's/.*_unitdir[[:blank:]]*//p' %{S:0})" mkdir -p %{buildroot}%{_unitdir}
for i in $UNITDIR `dirname $UNITDIR`; do
mkdir -p %{buildroot}$i
echo $i >> unitdir
done
%files -f unitdir %files
%defattr(-,root,root) %defattr(-,root,root)
%{_rpmconfigdir}/macros.d/macros.systemd %{_rpmconfigdir}/macros.d/macros.systemd
%dir %{_unitdir}
%changelog %changelog