Accepting request 339126 from home:fbui:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/339126
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=915

systemd-mini.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 15 14:12:44 UTC 2015 - fbui@suse.com
+
+- Fix again UEFI for mini package
+
 -------------------------------------------------------------------
 Thu Oct 15 08:19:00 UTC 2015 - werner@suse.de
 

systemd-mini.spec

@@ -687,7 +687,6 @@ cflags -Wl,--hash-size=8599	LDFLAGS
   --disable-myhostname \
   --disable-manpages \
   --disable-machined \
-  --disable-efi \
 %else
   --enable-manpages \
 %if %{with python}
@@ -1143,9 +1142,7 @@ exit 0
 %{_bindir}/networkctl
 %endif
 %{_bindir}/busctl
-%if !0%{?bootstrap}
 %{_bindir}/bootctl
-%endif
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
@@ -1252,14 +1249,12 @@ exit 0
 /%{_lib}/security/pam_systemd.so
 %config /etc/pam.d/systemd-user
 
-%if !0%{?bootstrap}
 %ifarch %{ix86} x86_64
 %dir %{_prefix}/lib/systemd/boot
 %dir %{_prefix}/lib/systemd/boot/efi
 %{_prefix}/lib/systemd/boot/efi/*.efi
 %{_prefix}/lib/systemd/boot/efi/*.stub
 %endif
-%endif
 
 %dir %{_libexecdir}/modules-load.d
 %dir %{_sysconfdir}/modules-load.d

systemd.changes

@@ -1,9 +1,7 @@
 -------------------------------------------------------------------
-Thu Oct 15 09:07:51 UTC 2015 - jengelh@inai.de
+Thu Oct 15 14:12:44 UTC 2015 - fbui@suse.com
 
-- Drop one more undesirable Obsoletes/Provides. This should have
+- Fix again UEFI for mini package
-  been a Conflicts. (There was already a Conflicts, and since
-  Conflicts go both ways, we won't need a second one.)
 
 -------------------------------------------------------------------
 Thu Oct 15 08:19:00 UTC 2015 - werner@suse.de

systemd.spec

@@ -426,6 +426,9 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 %if 0%{?bootstrap}
 Conflicts:      libudev1
+%else
+Obsoletes:      libudev1-mini
+Provides:       libudev1-mini
 %endif
 
 %description -n libudev%{?mini}1
@@ -679,7 +682,6 @@ cflags -Wl,--hash-size=8599	LDFLAGS
   --disable-myhostname \
   --disable-manpages \
   --disable-machined \
-  --disable-efi \
 %else
   --enable-manpages \
 %if %{with python}
@@ -1135,9 +1137,7 @@ exit 0
 %{_bindir}/networkctl
 %endif
 %{_bindir}/busctl
-%if !0%{?bootstrap}
 %{_bindir}/bootctl
-%endif
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
@@ -1244,14 +1244,12 @@ exit 0
 /%{_lib}/security/pam_systemd.so
 %config /etc/pam.d/systemd-user
 
-%if !0%{?bootstrap}
 %ifarch %{ix86} x86_64
 %dir %{_prefix}/lib/systemd/boot
 %dir %{_prefix}/lib/systemd/boot/efi
 %{_prefix}/lib/systemd/boot/efi/*.efi
 %{_prefix}/lib/systemd/boot/efi/*.stub
 %endif
-%endif
 
 %dir %{_libexecdir}/modules-load.d
 %dir %{_sysconfdir}/modules-load.d