diff --git a/openSUSE-MicroOS-release.spec b/openSUSE-MicroOS-release.spec index 507568af..a3f8cef9 100644 --- a/openSUSE-MicroOS-release.spec +++ b/openSUSE-MicroOS-release.spec @@ -24,13 +24,12 @@ License: GPL-2.0-or-later Group: System/Fhs Source100: weakremovers.inc BuildRequires: skelcd-openSUSE -Requires: issue-generator # Make sure we are at SLES12 SP2 level PreReq: glibc >= 2.19 # in rare cases, 'ln' is not found... Requires(post): coreutils -Recommends: branding-openSUSE -Recommends: distribution-logos-openSUSE-MicroOS +Suggests: branding-openSUSE +Suggests: distribution-logos-openSUSE-MicroOS Suggests: openSUSE-build-key Conflicts: distribution-release Conflicts: kernel < 4.4 diff --git a/openSUSE-release.spec b/openSUSE-release.spec index e5ce5e03..78ba2996 100644 --- a/openSUSE-release.spec +++ b/openSUSE-release.spec @@ -29,14 +29,8 @@ Group: System/Fhs Source100: weakremovers.inc BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE -# /etc/issue is no longer a default file, but is auto-generated at bootup -Requires: issue-generator -#PreReq: coreutils -# the post scriptlets uses awk, boo#976913 -Requires(post): awk -Requires(post): issue-generator -Recommends: branding-openSUSE -Recommends: distribution-logos-openSUSE-Tumbleweed +Suggests: branding-openSUSE +Suggests: distribution-logos-openSUSE-Tumbleweed Suggests: openSUSE-build-key Suggests: java-11-openjdk Suggests: mariadb @@ -734,21 +728,6 @@ EOF # this is a base product, create symlink ln -s openSUSE.prod %{buildroot}%{_sysconfdir}/products.d/baseproduct -%post -# Upgrade path - if /etc/default/grub contains any of the DISTRIBUTOR= tags -# we ever put, replace it with "", which means grub will use /etc/os-release to make something up -if [ -f %{_sysconfdir}/default/grub ]; then - DISTRIBUTOR=$(awk -F= '/^GRUB_DISTRIBUTOR/ {print $2}' %{_sysconfdir}/default/grub | tr -d '"') - case "$DISTRIBUTOR" in - "openSUSE" | \ - "openSUSE 13.1" | \ - "openSUSE 13.2") - # replace GRUB_DISTRIBUTOR in %{_sysconfdir}/default/grub with "" - sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=/" %{_sysconfdir}/default/grub - ;; - esac -fi - %posttrans # Launch the issue-generator: we have a new config file in /usr/lib/issue.d that needs to be represented if [ -x %{_sbindir}/issue-generator ]; then diff --git a/weakremovers.inc b/weakremovers.inc index fb2404e4..1ce7e14d 100644 --- a/weakremovers.inc +++ b/weakremovers.inc @@ -10105,6 +10105,7 @@ Provides: weakremover(libfifechan_sdl0_1_4) Provides: weakremover(libfilezilla0) Provides: weakremover(libfilezilla2) Provides: weakremover(libfilezilla3) +Provides: weakremover(libfilezilla4) Provides: weakremover(libfind3_0) Provides: weakremover(libfli-devel) Provides: weakremover(libfli1) @@ -10184,6 +10185,7 @@ Provides: weakremover(libgit2-28) Provides: weakremover(libglademm) Provides: weakremover(libglademm-2_4-1) Provides: weakremover(libglademm-devel) +Provides: weakremover(libgladeui-2-6) Provides: weakremover(libglibmm-2_52-1) Provides: weakremover(libglibmm-2_56-1) Provides: weakremover(libglibmm-2_58-1) @@ -10666,6 +10668,7 @@ Provides: weakremover(liblua5_2) Provides: weakremover(liblua5_2-5) Provides: weakremover(liblwres141) Provides: weakremover(liblwres160) +Provides: weakremover(liblxpanel0) Provides: weakremover(liblz4-1_7) Provides: weakremover(liblzmasdk16) Provides: weakremover(libmal-devel) @@ -10728,6 +10731,7 @@ Provides: weakremover(libmygpo-qt-devel) Provides: weakremover(libmygpo-qt1) Provides: weakremover(libmypaint-1_3-0) Provides: weakremover(libmypaint-1_4-0) +Provides: weakremover(libmypaint-1_5-1) Provides: weakremover(libmysofa0) Provides: weakremover(libmysqlclient18) Provides: weakremover(libmysqlclient_r18) @@ -11469,6 +11473,7 @@ Provides: weakremover(libwiretap6) Provides: weakremover(libwiretap7) Provides: weakremover(libwiretap8) Provides: weakremover(libwiretap9) +Provides: weakremover(libwlc0) Provides: weakremover(libwlroots0) Provides: weakremover(libwlroots1) Provides: weakremover(libwlroots2) @@ -11880,6 +11885,9 @@ Provides: weakremover(lv2-linuxsampler) Provides: weakremover(lxcc) Provides: weakremover(lxmusic) Provides: weakremover(lxmusic-lang) +Provides: weakremover(lxpanel) +Provides: weakremover(lxpanel-devel) +Provides: weakremover(lxpanel-lang) Provides: weakremover(lxpanel-plugin-power-manager) Provides: weakremover(lxqt-admin-lang) Provides: weakremover(mailman) @@ -12839,6 +12847,7 @@ Provides: weakremover(postgresql93-plr-doc) Provides: weakremover(postgresql93-pltcl) Provides: weakremover(postgresql93-server) Provides: weakremover(postgresql93-test) +Provides: weakremover(powdertoy) Provides: weakremover(ppp-userpass) Provides: weakremover(prewikka) Provides: weakremover(product-builder-plugin-openSUSE) @@ -16696,6 +16705,26 @@ Provides: weakremover(resolve-trivial-conflicts) Provides: weakremover(reuse-lang) Provides: weakremover(rfcat) Provides: weakremover(rfcat-udev) +Provides: weakremover(roccat-arvo) +Provides: weakremover(roccat-isku) +Provides: weakremover(roccat-iskufx) +Provides: weakremover(roccat-kiro) +Provides: weakremover(roccat-kone) +Provides: weakremover(roccat-koneplus) +Provides: weakremover(roccat-konepure) +Provides: weakremover(roccat-konextd) +Provides: weakremover(roccat-kova2016) +Provides: weakremover(roccat-kovaplus) +Provides: weakremover(roccat-lua) +Provides: weakremover(roccat-nyth) +Provides: weakremover(roccat-pyra) +Provides: weakremover(roccat-ryos) +Provides: weakremover(roccat-savu) +Provides: weakremover(roccat-skeltr) +Provides: weakremover(roccat-sova) +Provides: weakremover(roccat-suora) +Provides: weakremover(roccat-tools) +Provides: weakremover(roccat-tyon) Provides: weakremover(rpm-python) Provides: weakremover(rst2html5) Provides: weakremover(rsvg2-sharp) @@ -21193,6 +21222,8 @@ Provides: weakremover(typelib-1_0-JavaScriptCore-3_0) Provides: weakremover(typelib-1_0-Manette-0_2) Provides: weakremover(typelib-1_0-MetaMuffin-0_0) Provides: weakremover(typelib-1_0-Modulemd-1_0) +Provides: weakremover(typelib-1_0-MyPaint-1_5) +Provides: weakremover(typelib-1_0-MyPaintGegl-1_5) Provides: weakremover(typelib-1_0-NMClient-1_0) Provides: weakremover(typelib-1_0-NMGtk-1_0) Provides: weakremover(typelib-1_0-NetworkManager-1_0) @@ -21224,6 +21255,8 @@ Provides: weakremover(udisks) Provides: weakremover(udisks-devel) Provides: weakremover(udisks-glue) Provides: weakremover(udisks2-devel) +Provides: weakremover(ufw) +Provides: weakremover(ufw-lang) Provides: weakremover(uim-qt4) Provides: weakremover(ultrastar-deluxe) Provides: weakremover(uml-utilities) @@ -21303,6 +21336,7 @@ Provides: weakremover(wine-staging-nine) Provides: weakremover(wine-staging-nine-devel) Provides: weakremover(wireguard) Provides: weakremover(wireguard-kmp-default) +Provides: weakremover(wlc-devel) Provides: weakremover(wmakerconf) Provides: weakremover(wmgui) Provides: weakremover(wminput)