Accepting request 741449 from home:lnussel:branches:Base:System

- don't package locales in -mini package

OBS-URL: https://build.opensuse.org/request/show/741449
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1074
This commit is contained in:
Franck Bui 2019-10-21 10:20:46 +00:00 committed by Git OBS Bridge
parent 488e9c4e05
commit 17ef8bf2c2
4 changed files with 24 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 21 09:06:10 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
- don't package locales in -mini package
-------------------------------------------------------------------
Fri Oct 4 14:26:59 UTC 2019 - Franck Bui <fbui@suse.com>

View File

@ -463,7 +463,9 @@ This package contains systemd-journal-gatewayd,
systemd-journal-remote, and systemd-journal-upload.
%endif
%if ! 0%{?bootstrap}
%lang_package
%endif
%prep
%setup -q -n systemd-v%{version}%{suse_version}
@ -544,6 +546,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
%else
rm %{buildroot}%{_libdir}/libnss_systemd.so*
rm -r %{buildroot}%{_datadir}/locale
%endif
# Don't ship resolvconf symlink for now as it conflicts with the
@ -737,7 +740,9 @@ fi
# which may still be used by yast.
cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
%if ! 0%{?bootstrap}
%find_lang systemd
%endif
# Build of installation images uses a hard coded list of packages with
# a %pre that needs to be run during the build. systemd is one of them
@ -1271,7 +1276,9 @@ fi
%{_datadir}/zsh/site-functions/*
%{_datadir}/pkgconfig/systemd.pc
%if ! 0%{?bootstrap}
%files lang -f systemd.lang
%endif
%files devel
%defattr(-,root,root,-)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 21 09:06:10 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
- don't package locales in -mini package
-------------------------------------------------------------------
Fri Oct 4 14:26:59 UTC 2019 - Franck Bui <fbui@suse.com>

View File

@ -461,7 +461,9 @@ This package contains systemd-journal-gatewayd,
systemd-journal-remote, and systemd-journal-upload.
%endif
%if ! 0%{?bootstrap}
%lang_package
%endif
%prep
%setup -q -n systemd-v%{version}%{suse_version}
@ -542,6 +544,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
%else
rm %{buildroot}%{_libdir}/libnss_systemd.so*
rm -r %{buildroot}%{_datadir}/locale
%endif
# Don't ship resolvconf symlink for now as it conflicts with the
@ -735,7 +738,9 @@ fi
# which may still be used by yast.
cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
%if ! 0%{?bootstrap}
%find_lang systemd
%endif
# Build of installation images uses a hard coded list of packages with
# a %pre that needs to be run during the build. systemd is one of them
@ -1269,7 +1274,9 @@ fi
%{_datadir}/zsh/site-functions/*
%{_datadir}/pkgconfig/systemd.pc
%if ! 0%{?bootstrap}
%files lang -f systemd.lang
%endif
%files devel
%defattr(-,root,root,-)