Accepting request 727004 from home:lnussel:branches:system:install:head
- use obsolete_legacy_pattern macro for readability - drop _opt patterns and integrate them into main patterns to reduce complexity OBS-URL: https://build.opensuse.org/request/show/727004 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=107
This commit is contained in:
Git OBS Bridge
parent
d3ec8c6c51
commit
c6b2f0c4af
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 28 15:42:20 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- use obsolete_legacy_pattern macro for readability
|
||||
- drop _opt patterns and integrate them into main patterns to reduce complexity
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 14 13:48:25 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
|
||||
@ -48,17 +48,7 @@ Provides: pattern() = 32bit
|
||||
Provides: pattern-icon() = pattern-cli
|
||||
Provides: pattern-order() = 1180
|
||||
Provides: pattern-visible()
|
||||
%if 0%{?is_opensuse}
|
||||
Provides: patterns-openSUSE-32bit = %{version}
|
||||
Provides: patterns-openSUSE-x86 = %{version}
|
||||
Obsoletes: patterns-openSUSE-32bit < %{version}
|
||||
Obsoletes: patterns-openSUSE-x86 < %{version}
|
||||
%else
|
||||
Provides: patterns-sled-32bit = %{version}
|
||||
Provides: patterns-sles-32bit = %{version}
|
||||
Obsoletes: patterns-sled-32bit < %{version}
|
||||
Obsoletes: patterns-sles-32bit < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern 32bit
|
||||
|
||||
%description 32bit
|
||||
This will install the 32-bit variant of all selected patterns. This allows to execute 32-bit software.
|
||||
@ -78,19 +68,8 @@ Provides: pattern() = apparmor
|
||||
Provides: pattern-icon() = pattern-apparmor
|
||||
Provides: pattern-order() = 1100
|
||||
Provides: pattern-visible()
|
||||
%if 0%{?is_opensuse}
|
||||
Provides: patterns-openSUSE-apparmor = %{version}
|
||||
Obsoletes: patterns-openSUSE-apparmor < %{version}
|
||||
%else
|
||||
Provides: patterns-sled-apparmor = %{version}
|
||||
Provides: patterns-sles-apparmor = %{version}
|
||||
Obsoletes: patterns-sled-apparmor < %{version}
|
||||
Obsoletes: patterns-sles-apparmor < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern apparmor
|
||||
Requires: pattern() = minimal_base
|
||||
%if 0%{?is_opensuse}
|
||||
Recommends: pattern() = apparmor_opt
|
||||
%endif
|
||||
|
||||
Requires: apparmor-abstractions
|
||||
Requires: apparmor-parser
|
||||
@ -104,6 +83,7 @@ Requires: audit
|
||||
%else
|
||||
Recommends: audit
|
||||
%endif
|
||||
Recommends: apparmor-docs
|
||||
|
||||
%description apparmor
|
||||
AppArmor is an application security framework that provides mandatory access control for programs. It protects from exploitation of software flaws and compromised systems. It offers an advanced tool set that automates the development of per-program application security without requiring additional knowledge.
|
||||
@ -114,32 +94,6 @@ AppArmor is an application security framework that provides mandatory access con
|
||||
|
||||
################################################################################
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%package apparmor_opt
|
||||
%pattern_basetechnologies
|
||||
Summary: AppArmor
|
||||
Group: Metapackages
|
||||
Provides: pattern() = apparmor_opt
|
||||
Provides: pattern-extends() = apparmor
|
||||
Provides: pattern-icon() = pattern-apparmor
|
||||
Provides: pattern-order() = 1080
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-apparmor_opt = %{version}
|
||||
Obsoletes: patterns-openSUSE-apparmor_opt < %{version}
|
||||
Requires: pattern() = minimal_base
|
||||
|
||||
Requires: apparmor-docs
|
||||
|
||||
%description apparmor_opt
|
||||
AppArmor is an application security framework that provides mandatory access control for programs. It protects from exploitation of software flaws and compromised systems. It offers an advanced tool set that automates the development of per-program application security without requiring additional knowledge.
|
||||
|
||||
%files apparmor_opt
|
||||
%dir %{_docdir}/patterns
|
||||
%{_docdir}/patterns/apparmor_opt.txt
|
||||
%endif
|
||||
|
||||
################################################################################
|
||||
|
||||
%package basesystem
|
||||
%pattern_basetechnologies
|
||||
Summary: Minimal Base System (alias pattern for base)
|
||||
@ -165,15 +119,8 @@ Provides: pattern() = base
|
||||
Provides: pattern-icon() = pattern-basis
|
||||
Provides: pattern-order() = 1030
|
||||
Provides: pattern-visible()
|
||||
%if 0%{?is_opensuse}
|
||||
Provides: patterns-openSUSE-base = %{version}
|
||||
Obsoletes: patterns-openSUSE-base < %{version}
|
||||
%else
|
||||
Provides: patterns-sles-base
|
||||
Provides: patterns-sles-minimal
|
||||
Obsoletes: patterns-sles-base < %{version}
|
||||
Obsoletes: patterns-sles-minimal < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern base
|
||||
%obsolete_legacy_pattern minimal
|
||||
Requires: pattern() = minimal_base
|
||||
|
||||
Requires: e2fsprogs
|
||||
@ -259,6 +206,7 @@ Provides: pattern-icon() = pattern-desktop
|
||||
Provides: pattern-order() = 1802
|
||||
Provides: pattern-visible()
|
||||
# We want SLES-15 systems to install this pattern on upgrade to SLES-16
|
||||
# XXX 2019-08-28 this package still exists so an obsolete is wrong here
|
||||
%if !0%{?is_opensuse}
|
||||
Obsoletes: patterns-base-x11 < %{version}
|
||||
%endif
|
||||
@ -289,9 +237,7 @@ Provides: pattern() = console
|
||||
Provides: pattern-icon() = pattern-cli
|
||||
Provides: pattern-order() = 1120
|
||||
Provides: pattern-visible()
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-console = %{version}
|
||||
Obsoletes: patterns-openSUSE-console < %{version}
|
||||
%obsolete_legacy_pattern console
|
||||
Requires: pattern() = enhanced_base
|
||||
Recommends: pattern() = yast2_basis
|
||||
|
||||
@ -350,10 +296,7 @@ Provides: pattern-icon() = pattern-documentation
|
||||
Provides: pattern-order() = 1005
|
||||
Provides: pattern-visible()
|
||||
Requires: pattern() = basesystem
|
||||
%if !0%{?is_opensuse}
|
||||
Provides: patterns-sled-documentation
|
||||
Obsoletes: patterns-sles-documentation < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern documentation
|
||||
|
||||
Recommends: info2html
|
||||
Recommends: man-pages
|
||||
@ -386,17 +329,11 @@ Provides: pattern() = enhanced_base
|
||||
Provides: pattern-icon() = pattern-basis
|
||||
Provides: pattern-order() = 1060
|
||||
Provides: pattern-visible()
|
||||
%if 0%{?is_opensuse}
|
||||
Provides: patterns-openSUSE-enhanced_base = %{version}
|
||||
Obsoletes: patterns-openSUSE-enhanced_base < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern enhanced_base
|
||||
Requires: pattern() = base
|
||||
Recommends: pattern() = apparmor
|
||||
Recommends: pattern() = sw_management
|
||||
Recommends: pattern() = yast2_basis
|
||||
%if 0%{?is_opensuse}
|
||||
Recommends: pattern() = enhanced_base_opt
|
||||
%endif
|
||||
|
||||
Recommends: aaa_base-extras
|
||||
# getfacl and setfacl
|
||||
@ -595,30 +532,6 @@ Recommends: numactl
|
||||
Recommends: ucode-amd
|
||||
Recommends: ucode-intel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description enhanced_base
|
||||
This is the enhanced base runtime system with lots of convenience packages.
|
||||
|
||||
%files enhanced_base
|
||||
%dir %{_docdir}/patterns
|
||||
%{_docdir}/patterns/enhanced_base.txt
|
||||
|
||||
################################################################################
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%package enhanced_base_opt
|
||||
%pattern_basetechnologies
|
||||
Summary: Enhanced Base System
|
||||
Group: Metapackages
|
||||
Provides: pattern() = enhanced_base_opt
|
||||
Provides: pattern-extends() = enhanced_base
|
||||
Provides: pattern-icon() = pattern-software-management
|
||||
Provides: pattern-order() = 1040
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-enhanced_base_opt = %{version}
|
||||
Obsoletes: patterns-openSUSE-enhanced_base_opt < %{version}
|
||||
|
||||
Recommends: joe
|
||||
Recommends: mpt-status
|
||||
Recommends: perl-TermReadLine-Gnu
|
||||
@ -658,14 +571,16 @@ Suggests: xfsdump
|
||||
%ifarch %ix86 x86_64
|
||||
Suggests: hyper-v
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description enhanced_base_opt
|
||||
%description enhanced_base
|
||||
This is the enhanced base runtime system with lots of convenience packages.
|
||||
|
||||
%files enhanced_base_opt
|
||||
%files enhanced_base
|
||||
%dir %{_docdir}/patterns
|
||||
%{_docdir}/patterns/enhanced_base_opt.txt
|
||||
%endif
|
||||
%{_docdir}/patterns/enhanced_base.txt
|
||||
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
|
||||
@ -677,9 +592,7 @@ Provides: pattern() = minimal_base
|
||||
Provides: pattern-icon() = pattern-basis
|
||||
Provides: pattern-order() = 5190
|
||||
Provides: pattern-visible()
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-minimal_base = %{version}
|
||||
Obsoletes: patterns-openSUSE-minimal_base < %{version}
|
||||
%obsolete_legacy_pattern minimal_base
|
||||
|
||||
Requires: aaa_base
|
||||
Requires: bash
|
||||
@ -769,10 +682,7 @@ Provides: pattern() = sw_management
|
||||
Provides: pattern-icon() = pattern-software-management
|
||||
Provides: pattern-order() = 1360
|
||||
Provides: pattern-visible()
|
||||
%if 0%{?is_opensuse}
|
||||
Provides: patterns-openSUSE-sw_management = %{version}
|
||||
Obsoletes: patterns-openSUSE-sw_management < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern sw_management
|
||||
%if 0%{?sle_version}
|
||||
Recommends: pattern() = sw_management_x11
|
||||
|
||||
@ -800,9 +710,7 @@ Provides: pattern() = update_test
|
||||
Provides: pattern-icon() = pattern-tests
|
||||
Provides: pattern-order() = 1380
|
||||
Provides: pattern-visible()
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-update_test = %{version}
|
||||
Obsoletes: patterns-openSUSE-update_test < %{version}
|
||||
%obsolete_legacy_pattern update_test
|
||||
|
||||
Recommends: update-test-affects-package-manager
|
||||
Recommends: update-test-interactive
|
||||
@ -833,14 +741,10 @@ Provides: pattern() = x11
|
||||
Provides: pattern-icon() = pattern-x11
|
||||
Provides: pattern-order() = 1800
|
||||
Provides: pattern-visible()
|
||||
%if 0%{?is_opensuse}
|
||||
Provides: patterns-openSUSE-x11 = %{version}
|
||||
Obsoletes: patterns-openSUSE-x11 < %{version}
|
||||
%endif
|
||||
%obsolete_legacy_pattern x11
|
||||
Requires: pattern() = base
|
||||
%if 0%{?is_opensuse}
|
||||
Recommends: pattern() = x11_enhanced
|
||||
Recommends: pattern() = x11_opt
|
||||
%endif
|
||||
|
||||
Requires: xorg-x11-fonts-core
|
||||
@ -889,19 +793,10 @@ Group: Metapackages
|
||||
Provides: pattern() = x11_enhanced
|
||||
Provides: pattern-icon() = pattern-x11
|
||||
Provides: pattern-order() = 1801
|
||||
%if 0%{?is_opensuse}
|
||||
Obsoletes: patterns-openSUSE-x11 < %{version}
|
||||
%else
|
||||
Provides: patterns-sled-minimal
|
||||
Obsoletes: patterns-sled-minimal < %{version}
|
||||
%endif
|
||||
Requires: pattern() = enhanced_base
|
||||
Requires: pattern() = fonts
|
||||
Requires: pattern() = x11
|
||||
Recommends: pattern() = x11_yast
|
||||
%if 0%{?is_opensuse}
|
||||
Recommends: pattern() = x11_opt
|
||||
%endif
|
||||
|
||||
# 1057377
|
||||
Requires: glibc-locale
|
||||
@ -949,31 +844,6 @@ Recommends: susepaste-screenshot
|
||||
Suggests: gvim
|
||||
Suggests: hexchat
|
||||
Suggests: wpa_supplicant-gui
|
||||
%endif
|
||||
|
||||
%description x11_enhanced
|
||||
The X Window System provides the only standard platform-independent networked graphical window system bridging the heterogeneous platforms in today's enterprise: from network servers to desktops, thin clients, laptops, and handhelds, independent of operating system and hardware.
|
||||
|
||||
%files x11_enhanced
|
||||
%dir %{_docdir}/patterns
|
||||
%{_docdir}/patterns/x11_enhanced.txt
|
||||
|
||||
################################################################################
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%package x11_opt
|
||||
%pattern_graphicalenvironments
|
||||
Summary: X Window System
|
||||
Group: Metapackages
|
||||
Provides: pattern() = x11_opt
|
||||
Provides: pattern-extends() = x11
|
||||
Provides: pattern-icon() = pattern-x11
|
||||
Provides: pattern-order() = 1680
|
||||
# Keep these grouped
|
||||
Provides: patterns-openSUSE-x11_opt = %{version}
|
||||
Obsoletes: patterns-openSUSE-x11_opt < %{version}
|
||||
Requires: pattern() = enhanced_base
|
||||
Requires: pattern() = fonts
|
||||
# needed e.g. for nvidia drivers
|
||||
# #302566
|
||||
Recommends: x11-tools
|
||||
@ -988,14 +858,14 @@ Suggests: xorg-x11-driver-video-radeonhd
|
||||
Suggests: xorg-x11-driver-video-unichrome
|
||||
# #389816
|
||||
Suggests: xorg-x11-server-sdk
|
||||
%endif
|
||||
|
||||
%description x11_opt
|
||||
%description x11_enhanced
|
||||
The X Window System provides the only standard platform-independent networked graphical window system bridging the heterogeneous platforms in today's enterprise: from network servers to desktops, thin clients, laptops, and handhelds, independent of operating system and hardware.
|
||||
|
||||
%files x11_opt
|
||||
%files x11_enhanced
|
||||
%dir %{_docdir}/patterns
|
||||
%{_docdir}/patterns/x11_opt.txt
|
||||
%endif
|
||||
%{_docdir}/patterns/x11_enhanced.txt
|
||||
|
||||
################################################################################
|
||||
|
||||
@ -1130,7 +1000,7 @@ done
|
||||
# These packages don't generate a 32bit pattern
|
||||
for i in \
|
||||
%if 0%{?is_opensuse}
|
||||
apparmor_opt basesystem basic_desktop console documentation enhanced_base_opt transactional_base update_test x11_opt \
|
||||
basesystem basic_desktop console documentation transactional_base update_test \
|
||||
%else
|
||||
%ifnarch s390 s390x
|
||||
32bit \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user