Accepting request 321834 from home:jengelh:d2

- Use Obsolete/Provides strategy (from mingw, thumbs to fstrba)

DO ADJUST the prjconf of Base:System / openSUSE:Factory
* remove Prefer: and Ignore: lines regarding systemd and udev

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

systemd-mini.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 11 09:48:26 UTC 2015 - jengelh@inai.de
+
+- Use Obsolete/Provides strategy from
+  windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap
+  cycle and kick out -mini afterwards.
+
 -------------------------------------------------------------------
 Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com
 

systemd-mini.spec

@@ -84,9 +84,8 @@ BuildRequires:  pkgconfig(libsepol)
 Conflicts:      sysvinit
 %if 0%{?bootstrap}
 #!BuildIgnore:  dbus-1
-Requires:       this-is-only-for-build-envs
+Provides:       systemd = %version-%release
-Conflicts:      systemd
+Conflicts:      otherproviders(systemd)
-Conflicts:      kiwi
 %else
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libgcrypt-devel
@@ -325,7 +324,11 @@ Group:          Development/Libraries/C and C++
 Requires:       libsystemd0%{?mini} = %version
 Requires:       systemd-rpm-macros
 %if 0%{?bootstrap}
-Conflicts:      systemd-devel
+Provides:       systemd-devel = %version-%release
+Conflicts:      otherproviders(systemd-devel)
+%else
+Obsoletes:      systemd-mini-devel
+Provides:       systemd-mini-devel
 %endif
 
 %description devel
@@ -349,9 +352,9 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 %if 0%{?bootstrap}
 Conflicts:      libsystemd0
-Conflicts:      kiwi
+%else
-# avoid kiwi picking it for bootstrap
+Obsoletes:      libsystemd0-mini
-Requires:       this-is-only-for-build-envs
+Provides:       libsystemd0-mini
 %endif
 
 %description -n libsystemd0%{?mini}
@@ -410,8 +413,9 @@ Requires:       filesystem
 %if 0%{?bootstrap}
 Provides:       udev = %version-%release
 Conflicts:      otherproviders(udev)
-# avoid kiwi picking it for bootstrap
+%else
-Requires:       this-is-only-for-build-envs
+Obsoletes:      udev-mini
+Provides:       udev-mini
 %endif
 
 %description -n udev%{?mini}
@@ -430,9 +434,9 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 %if 0%{?bootstrap}
 Conflicts:      libudev1
-Conflicts:      kiwi
+%else
-# avoid kiwi picking it for bootstrap
+Obsoletes:      libudev1-mini
-Requires:       this-is-only-for-build-envs
+Provides:       libudev1-mini
 %endif
 
 %description -n libudev%{?mini}1
@@ -447,6 +451,9 @@ Requires:       libudev%{?mini}1 = %version-%release
 %if 0%{?bootstrap}
 Provides:       libudev-devel = %version-%release
 Conflicts:      otherproviders(libudev-devel)
+%else
+Obsoletes:      libudev-mini-devel
+Provides:       libudev-mini-devel
 %endif
 
 %description -n libudev%{?mini}-devel

systemd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 11 09:48:26 UTC 2015 - jengelh@inai.de
+
+- Use Obsolete/Provides strategy from
+  windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap
+  cycle and kick out -mini afterwards.
+
 -------------------------------------------------------------------
 Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com
 

systemd.spec

@@ -80,9 +80,8 @@ BuildRequires:  pkgconfig(libsepol)
 Conflicts:      sysvinit
 %if 0%{?bootstrap}
 #!BuildIgnore:  dbus-1
-Requires:       this-is-only-for-build-envs
+Provides:       systemd = %version-%release
-Conflicts:      systemd
+Conflicts:      otherproviders(systemd)
-Conflicts:      kiwi
 %else
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libgcrypt-devel
@@ -321,7 +320,11 @@ Group:          Development/Libraries/C and C++
 Requires:       libsystemd0%{?mini} = %version
 Requires:       systemd-rpm-macros
 %if 0%{?bootstrap}
-Conflicts:      systemd-devel
+Provides:       systemd-devel = %version-%release
+Conflicts:      otherproviders(systemd-devel)
+%else
+Obsoletes:      systemd-mini-devel
+Provides:       systemd-mini-devel
 %endif
 
 %description devel
@@ -345,9 +348,9 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 %if 0%{?bootstrap}
 Conflicts:      libsystemd0
-Conflicts:      kiwi
+%else
-# avoid kiwi picking it for bootstrap
+Obsoletes:      libsystemd0-mini
-Requires:       this-is-only-for-build-envs
+Provides:       libsystemd0-mini
 %endif
 
 %description -n libsystemd0%{?mini}
@@ -406,8 +409,9 @@ Requires:       filesystem
 %if 0%{?bootstrap}
 Provides:       udev = %version-%release
 Conflicts:      otherproviders(udev)
-# avoid kiwi picking it for bootstrap
+%else
-Requires:       this-is-only-for-build-envs
+Obsoletes:      udev-mini
+Provides:       udev-mini
 %endif
 
 %description -n udev%{?mini}
@@ -426,9 +430,9 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 %if 0%{?bootstrap}
 Conflicts:      libudev1
-Conflicts:      kiwi
+%else
-# avoid kiwi picking it for bootstrap
+Obsoletes:      libudev1-mini
-Requires:       this-is-only-for-build-envs
+Provides:       libudev1-mini
 %endif
 
 %description -n libudev%{?mini}1
@@ -443,6 +447,9 @@ Requires:       libudev%{?mini}1 = %version-%release
 %if 0%{?bootstrap}
 Provides:       libudev-devel = %version-%release
 Conflicts:      otherproviders(libudev-devel)
+%else
+Obsoletes:      libudev-mini-devel
+Provides:       libudev-mini-devel
 %endif
 
 %description -n libudev%{?mini}-devel