From 256948681abe4357e01cb847ea1dcbbc691327e1c86159745b14bea4e1a18dfc Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 16 Aug 2023 17:01:33 +0000
Subject: [PATCH] - systemd.spec: add journal translations to lang package

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1422
---
 files.lang      | 19 +++++++++++++++++++
 files.systemd   | 16 ----------------
 systemd.changes |  5 +++++
 systemd.spec    | 10 +++-------
 4 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 files.lang

diff --git a/files.lang b/files.lang
new file mode 100644
index 0000000..1b023f8
--- /dev/null
+++ b/files.lang
@@ -0,0 +1,19 @@
+#
+# Please keep the list sorted (with `LC_ALL=C sort`).
+#
+%lang(be) %{_journalcatalogdir}/systemd.be.catalog
+%lang(be@latin) %{_journalcatalogdir}/systemd.be@latin.catalog
+%lang(bg) %{_journalcatalogdir}/systemd.bg.catalog
+%lang(da) %{_journalcatalogdir}/systemd.da.catalog
+%lang(de) %{_journalcatalogdir}/systemd.de.catalog
+%lang(fr) %{_journalcatalogdir}/systemd.fr.catalog
+%lang(hr) %{_journalcatalogdir}/systemd.hr.catalog
+%lang(hu) %{_journalcatalogdir}/systemd.hu.catalog
+%lang(it) %{_journalcatalogdir}/systemd.it.catalog
+%lang(ko) %{_journalcatalogdir}/systemd.ko.catalog
+%lang(pl) %{_journalcatalogdir}/systemd.pl.catalog
+%lang(pt_BR) %{_journalcatalogdir}/systemd.pt_BR.catalog
+%lang(ru) %{_journalcatalogdir}/systemd.ru.catalog
+%lang(sr) %{_journalcatalogdir}/systemd.sr.catalog
+%lang(zh_CN) %{_journalcatalogdir}/systemd.zh_CN.catalog
+%lang(zh_TW) %{_journalcatalogdir}/systemd.zh_TW.catalog
diff --git a/files.systemd b/files.systemd
index ec14719..f731b1e 100644
--- a/files.systemd
+++ b/files.systemd
@@ -206,23 +206,7 @@
 %{_datadir}/zsh/site-functions/_systemd-tmpfiles
 %{_datadir}/zsh/site-functions/_timedatectl
 %endif
-%{_journalcatalogdir}/systemd.be.catalog
-%{_journalcatalogdir}/systemd.be@latin.catalog
-%{_journalcatalogdir}/systemd.bg.catalog
 %{_journalcatalogdir}/systemd.catalog
-%{_journalcatalogdir}/systemd.da.catalog
-%{_journalcatalogdir}/systemd.de.catalog
-%{_journalcatalogdir}/systemd.fr.catalog
-%{_journalcatalogdir}/systemd.hr.catalog
-%{_journalcatalogdir}/systemd.hu.catalog
-%{_journalcatalogdir}/systemd.it.catalog
-%{_journalcatalogdir}/systemd.ko.catalog
-%{_journalcatalogdir}/systemd.pl.catalog
-%{_journalcatalogdir}/systemd.pt_BR.catalog
-%{_journalcatalogdir}/systemd.ru.catalog
-%{_journalcatalogdir}/systemd.sr.catalog
-%{_journalcatalogdir}/systemd.zh_CN.catalog
-%{_journalcatalogdir}/systemd.zh_TW.catalog
 %if %{without bootstrap}
 %{_libdir}/libnss_myhostname.so.2
 %{_libdir}/libnss_systemd.so.2
diff --git a/systemd.changes b/systemd.changes
index 6279213..2aef66b 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 16 16:51:01 UTC 2023 - Ludwig Nussel <lnussel@suse.de>
+
+- systemd.spec: add journal translations to lang package
+
 -------------------------------------------------------------------
 Wed Aug 16 10:29:45 UTC 2023 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 6fa2033..831a7fb 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -191,6 +191,7 @@ Source206:      files.uefi-boot
 Source207:      files.experimental
 Source208:      files.coredump
 Source209:      files.homed
+Source210:      files.lang
 
 #
 # All changes backported from upstream are tracked by the git repository, which
@@ -689,9 +690,7 @@ 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,6 +722,7 @@ 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 \
@@ -757,7 +757,6 @@ 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,9 +1003,7 @@ tar -cO \
     -C test/ . | tar -xC %{buildroot}%{_testsuitedir}/integration-tests
 %endif
 
-%if %{without bootstrap}
 %find_lang systemd
-%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
@@ -1349,9 +1346,8 @@ fi
 %include %{SOURCE208}
 %endif
 
-%if %{without bootstrap}
 %files lang -f systemd.lang
-%endif
+%include %{SOURCE210}
 
 %if %{with journal_remote}
 %files journal-remote