From dcfd884160dc436b648e1da9bb88ce3407f8679735468b49c4ae38685aacc0a5 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 18 Aug 2023 12:53:51 +0000 Subject: [PATCH] don't build systemd-lang for the mini flavor OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1427 --- files.systemd | 2 -- systemd.spec | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/files.systemd b/files.systemd index f731b1eb..1a25d9ad 100644 --- a/files.systemd +++ b/files.systemd @@ -205,9 +205,7 @@ %{_datadir}/zsh/site-functions/_systemd-run %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl -%endif %{_journalcatalogdir}/systemd.catalog -%if %{without bootstrap} %{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_systemd.so.2 %endif diff --git a/systemd.spec b/systemd.spec index 2e1295e2..396d876f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -691,7 +691,9 @@ Currently this package contains: repart, oomd, measure, pcrphase and ukify. Have fun (at your own risk). %endif +%if %{without bootstrap} %lang_package +%endif %prep %autosetup -p1 -n systemd-v%{version}%{archive_version} @@ -723,7 +725,6 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Dtranslations=true \ %if %{with bootstrap} -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ @@ -758,6 +759,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Dselinux=%{when_not bootstrap} \ -Dtpm=%{when_not bootstrap} \ -Dtpm2=%{when_not bootstrap} \ + -Dtranslations=%{when_not bootstrap} \ -Duserdb=%{when_not bootstrap} \ \ -Dcoredump=%{when coredump} \ @@ -1004,7 +1006,11 @@ tar -cO \ -C test/ . | tar -xC %{buildroot}%{_testsuitedir}/integration-tests %endif +%if %{without bootstrap} %find_lang systemd +%else +rm -f %{buildroot}%{_journalcatalogdir}/* +%endif # Don't drop %%pre section even if it becomes empty: the build process of # installation images uses a hardcoded list of packages with a %%pre that needs @@ -1347,8 +1353,10 @@ fi %include %{SOURCE208} %endif +%if %{without bootstrap} %files lang -f systemd.lang %include %{SOURCE210} +%endif %if %{with journal_remote} %files journal-remote