From 12c0288e28b3cfce38b803269b9e14c94e03aa6b724ad2ec152132bb8de77348 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 13 Dec 2018 09:38:17 +0000 Subject: [PATCH] - Adjust icons to state of yast2-theme package OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-server?expand=0&rev=15 --- patterns-server.changes | 5 + patterns-server.spec | 267 +++++++++++++++++++--------------------- 2 files changed, 132 insertions(+), 140 deletions(-) diff --git a/patterns-server.changes b/patterns-server.changes index cf2452f..36ffe38 100644 --- a/patterns-server.changes +++ b/patterns-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 13 09:38:08 UTC 2018 - Dominique Leuenberger + +- Adjust icons to state of yast2-theme package + ------------------------------------------------------------------- Thu Jul 19 12:07:25 UTC 2018 - sflees@suse.de diff --git a/patterns-server.spec b/patterns-server.spec index 7e0b107..f961568 100644 --- a/patterns-server.spec +++ b/patterns-server.spec @@ -12,24 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %bcond_with betatest - Name: patterns-server Version: 20180718 Release: 0 Summary: Patterns for Installation (server patterns) License: MIT Group: Metapackages -Url: https://github.com/openSUSE/patterns +URL: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc Source1: pattern-definition-32bit.txt Source2: create_32bit-patterns_file.pl Source3: pre_checkin.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: patterns-rpm-macros %description @@ -49,15 +47,7 @@ Provides: pattern() = dhcp_dns_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 3040 Provides: pattern-visible() -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-dhcp_dns_server = %{version} -Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} -%else -Provides: patterns-sles-dhcp_dns_server = %{version} -Obsoletes: patterns-sles-dhcp_dns_server < %{version} -%endif Requires: pattern() = basesystem - Requires: bind Requires: dhcp-server Recommends: bind-chrootenv @@ -67,13 +57,20 @@ Recommends: dhcp-relay Recommends: dhcp-tools Recommends: yast2-dhcp-server Recommends: yast2-dns-server +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-dhcp_dns_server = %{version} +Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} +%else +Provides: patterns-sles-dhcp_dns_server = %{version} +Obsoletes: patterns-sles-dhcp_dns_server < %{version} +%endif %description dhcp_dns_server Software to set up a server for the Dynamic Host Configuration Protocol (DHCP) and the Domain Name System (DNS) services. DHCP provides configuration parameters to client computers to integrate them into a network, whereas DNS delivers information associated with domain names, in particular, the IP address. %files dhcp_dns_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/dhcp_dns_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/dhcp_dns_server.txt ################################################################################ @@ -85,6 +82,12 @@ Provides: pattern() = directory_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 3060 Provides: pattern-visible() +Requires: pattern() = basesystem +# bsc#1084789 +Recommends: 389-ds +Recommends: nss_ldap +Recommends: pam_ldap +Recommends: yast2-ldap-server %if 0%{?is_opensuse} Provides: patterns-openSUSE-directory_server = %{version} Obsoletes: patterns-openSUSE-directory_server < %{version} @@ -92,20 +95,13 @@ Obsoletes: patterns-openSUSE-directory_server < %{version} Provides: patterns-sles-directory_server = %{version} Obsoletes: patterns-sles-directory_server < %{version} %endif -Requires: pattern() = basesystem - -# bsc#1084789 -Recommends: 389-ds -Recommends: nss_ldap -Recommends: pam_ldap -Recommends: yast2-ldap-server %description directory_server Software to set up a directory server with OpenLDAP. The Lightweight Directory Access Protocol (LDAP) is used to access online directory services. %files directory_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/directory_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/directory_server.txt ################################################################################ @@ -117,15 +113,7 @@ Provides: pattern() = file_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 2900 Provides: pattern-visible() -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-file_server = %{version} -Obsoletes: patterns-openSUSE-file_server < %{version} -%else -Provides: patterns-sles-file_server = %{version} -Obsoletes: patterns-sles-file_server < %{version} -%endif Requires: pattern() = basesystem - Requires: nfs-kernel-server Recommends: nfsidmap Recommends: samba @@ -134,6 +122,13 @@ Recommends: samba-winbind Recommends: tftp Recommends: vsftpd %if 0%{?is_opensuse} +Provides: patterns-openSUSE-file_server = %{version} +Obsoletes: patterns-openSUSE-file_server < %{version} +%else +Provides: patterns-sles-file_server = %{version} +Obsoletes: patterns-sles-file_server < %{version} +%endif +%if 0%{?is_opensuse} Recommends: yast2-ftp-server Recommends: yast2-nfs-server Recommends: yast2-samba-server @@ -145,8 +140,8 @@ Suggests: atftp File services to host files so that they may be accessed or retrieved by other computers on the same network. This includes the FTP, SMB, and NFS protocols. %files file_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/file_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/file_server.txt ################################################################################ @@ -158,15 +153,7 @@ Provides: pattern() = gateway_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 3020 Provides: pattern-visible() -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-gateway_server = %{version} -Obsoletes: patterns-openSUSE-gateway_server < %{version} -%else -Provides: patterns-sles-gateway_server = %{version} -Obsoletes: patterns-sles-gateway_server < %{version} -%endif Requires: pattern() = basesystem - Requires: wireshark Recommends: arptables Recommends: calamaris @@ -180,13 +167,20 @@ Recommends: rarpd Recommends: squid Recommends: whois Recommends: wondershaper +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-gateway_server = %{version} +Obsoletes: patterns-openSUSE-gateway_server < %{version} +%else +Provides: patterns-sles-gateway_server = %{version} +Obsoletes: patterns-sles-gateway_server < %{version} +%endif %description gateway_server Software to set up a proxy, firewall, and gateway server, including a virtual private network (VPN) gateway. %files gateway_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gateway_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gateway_server.txt ################################################################################ @@ -198,6 +192,12 @@ Provides: pattern() = kvm_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 3099 Provides: pattern-visible() +Requires: pattern() = basesystem +Requires: tftp +Recommends: libvirt-daemon-qemu +Recommends: tigervnc +Recommends: virt-install +Recommends: vm-install %if 0%{?is_opensuse} Provides: patterns-openSUSE-kvm_server = %{version} Obsoletes: patterns-openSUSE-kvm_server < %{version} @@ -205,8 +205,6 @@ Obsoletes: patterns-openSUSE-kvm_server < %{version} Provides: patterns-sles-kvm_server = %{version} Obsoletes: patterns-sles-kvm_server < %{version} %endif -Requires: pattern() = basesystem - # fix issue because qemu-kvm is not present on all arch and # we would like to deprecate it for the futur (will be only # updated if already installed on the system) @@ -222,18 +220,13 @@ Requires: qemu-s390 %ifarch %arm Requires: qemu-arm %endif -Requires: tftp -Recommends: libvirt-daemon-qemu -Recommends: tigervnc -Recommends: virt-install -Recommends: vm-install %description kvm_server Software to set up a server for configuring, managing, and monitoring virtual machines on a single physical machine. %files kvm_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/kvm_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/kvm_server.txt ################################################################################ @@ -245,31 +238,30 @@ Provides: pattern() = kvm_tools Provides: pattern-icon() = pattern-server Provides: pattern-order() = 1090 Provides: pattern-visible() -%if !0%{?is_opensuse} -Provides: patterns-sles-kvm_tools = %{version} -Obsoletes: patterns-sles-kvm_tools < %{version} -%endif Requires: pattern() = basesystem Requires: pattern() = kvm_server - Requires: libvirt-client -Requires: libvirt-daemon-qemu Requires: libvirt-daemon-config-network +Requires: libvirt-daemon-qemu Requires: tigervnc -Requires: vm-install # bnc#868542 Requires: virt-manager +Requires: vm-install Recommends: openssh +# BSC#1078908 +Recommends: vim +Recommends: virt-install +Recommends: virt-v2v +Recommends: virt-viewer +Recommends: xorg-x11-xauth Recommends: yast2-control-center Recommends: yast2-ncurses Recommends: yast2-ncurses-pkg Recommends: yast2-vm -Recommends: xorg-x11-xauth -Recommends: virt-install -Recommends: virt-viewer -Recommends: virt-v2v -# BSC#1078908 -Recommends: vim +%if !0%{?is_opensuse} +Provides: patterns-sles-kvm_tools = %{version} +Obsoletes: patterns-sles-kvm_tools < %{version} +%endif %description kvm_tools This will provide all minimal system to get a running KVM Hypervisor @@ -277,8 +269,8 @@ and be able to configure, manage, and monitor virtual machines on a single physical machine. %files kvm_tools -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/kvm_tools.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/kvm_tools.txt ################################################################################ @@ -290,17 +282,8 @@ Provides: pattern() = lamp_server Provides: pattern-icon() = pattern-web-devel Provides: pattern-order() = 3000 Provides: pattern-visible() -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-lamp_server = %{version} -Obsoletes: patterns-openSUSE-lamp_server < %{version} -%else -Provides: patterns-sles-lamp_server = %{version} -Obsoletes: patterns-sles-lamp_server < %{version} -%endif Requires: pattern() = basesystem - Requires: apache2 -Recommends: yast2-http-server Recommends: apache2-doc Recommends: apache2-example-pages Recommends: apache2-mod_php7 @@ -310,13 +293,21 @@ Recommends: libapr-util1 Recommends: libapr1 Recommends: mariadb Recommends: perl +Recommends: yast2-http-server +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-lamp_server = %{version} +Obsoletes: patterns-openSUSE-lamp_server < %{version} +%else +Provides: patterns-sles-lamp_server = %{version} +Obsoletes: patterns-sles-lamp_server < %{version} +%endif %description lamp_server Software to set up a Web server that is able to serve static, dynamic, and interactive content (like a Web shop). This includes Apache HTTP Server, the database management system MySQL, and scripting languages such as PHP, Python, Ruby on Rails, or Perl. %files lamp_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/lamp_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/lamp_server.txt ################################################################################ @@ -328,15 +319,7 @@ Provides: pattern() = mail_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 2980 Provides: pattern-visible() -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-mail_server = %{version} -Obsoletes: patterns-openSUSE-mail_server < %{version} -%else -Provides: patterns-sles-mail_server = %{version} -Obsoletes: patterns-sles-mail_server < %{version} -%endif Requires: pattern() = basesystem - Requires: vacation Recommends: amavisd-new Recommends: clamav @@ -344,13 +327,20 @@ Recommends: cyrus-imapd Recommends: inn Recommends: mailman Recommends: spamassassin +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-mail_server = %{version} +Obsoletes: patterns-openSUSE-mail_server < %{version} +%else +Provides: patterns-sles-mail_server = %{version} +Obsoletes: patterns-sles-mail_server < %{version} +%endif %description mail_server Software to set up electronic mail and message services to handle email, mailing, and news lists, including a virus scanner to scan messages at the server level. %files mail_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/mail_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/mail_server.txt ################################################################################ @@ -362,6 +352,22 @@ Provides: pattern() = print_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 2960 Provides: pattern-visible() +Requires: pattern() = basesystem +Requires: cups +Recommends: OpenPrintingPPDs-ghostscript +Recommends: OpenPrintingPPDs-hpijs +Recommends: OpenPrintingPPDs-postscript +Recommends: cups-backends +Recommends: cups-filters +Recommends: cups-filters-cups-browsed +Recommends: cups-filters-foomatic-rip +Recommends: cups-filters-ghostscript +Recommends: epson-inkjet-printer-escpr +Recommends: gutenprint +Recommends: hplip-hpijs +Recommends: manufacturer-PPDs +Recommends: samba +Recommends: splix %if 0%{?is_opensuse} Provides: patterns-openSUSE-print_server = %{version} Obsoletes: patterns-openSUSE-print_server < %{version} @@ -369,23 +375,6 @@ Obsoletes: patterns-openSUSE-print_server < %{version} Provides: patterns-sles-printing = %{version} Obsoletes: patterns-sles-printing < %{version} %endif -Requires: pattern() = basesystem - -Requires: cups -Recommends: cups-backends -Recommends: cups-filters -Recommends: cups-filters-cups-browsed -Recommends: cups-filters-foomatic-rip -Recommends: cups-filters-ghostscript -Recommends: epson-inkjet-printer-escpr -Recommends: gutenprint -Recommends: hplip-hpijs -Recommends: manufacturer-PPDs -Recommends: OpenPrintingPPDs-ghostscript -Recommends: OpenPrintingPPDs-hpijs -Recommends: OpenPrintingPPDs-postscript -Recommends: samba -Recommends: splix %description printing This pattern provides all packages necessary for printing. It provides all @@ -393,8 +382,8 @@ needed packages for printing to a locally connected printer, printing using a remote print server and for setting up a print server. %files printing -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/printing.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/printing.txt ################################################################################ @@ -408,6 +397,17 @@ Provides: pattern() = xen_server Provides: pattern-icon() = pattern-server Provides: pattern-order() = 3080 Provides: pattern-visible() +Requires: pattern() = basesystem +Requires: kernel-xen +Requires: tftp +Requires: xen +Requires: xen-libs +Requires: xen-tools +Recommends: libvirt-daemon-xen +Recommends: tigervnc +# #382423 +Recommends: virt-install +Recommends: vm-install %if 0%{?is_opensuse} Provides: patterns-openSUSE-xen_server = %{version} Obsoletes: patterns-openSUSE-xen_server < %{version} @@ -415,25 +415,13 @@ Obsoletes: patterns-openSUSE-xen_server < %{version} Provides: patterns-sles-xen_server = %{version} Obsoletes: patterns-sles-xen_server < %{version} %endif -Requires: pattern() = basesystem - -Requires: kernel-xen -Requires: tftp -Requires: xen -Requires: xen-libs -Requires: xen-tools -Recommends: libvirt-daemon-xen -# #382423 -Recommends: virt-install -Recommends: vm-install -Recommends: tigervnc %description xen_server Software to set up a server for configuring, managing, and monitoring virtual machines on a single physical machine. %files xen_server -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/xen_server.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/xen_server.txt %endif ################################################################################ @@ -447,32 +435,31 @@ Provides: pattern() = xen_tools Provides: pattern-icon() = pattern-server Provides: pattern-order() = 1080 Provides: pattern-visible() -%if !0%{?is_opensuse} -Provides: patterns-sles-xen_tools = %{version} -Obsoletes: patterns-sles-xen_tools < %{version} -%endif Requires: pattern() = basesystem Requires: pattern() = xen_server - Requires: libvirt-client -Requires: libvirt-daemon-xen Requires: libvirt-daemon-config-network +Requires: libvirt-daemon-xen Requires: tigervnc -Requires: vm-install # bnc#868542 Requires: virt-manager +Requires: vm-install Recommends: openssh +# BSC#1078908 +Recommends: vim +Recommends: virt-install +Recommends: virt-viewer #Recommends: sles-xen_en-pdf Recommends: xen-doc-html +Recommends: xorg-x11-xauth Recommends: yast2-control-center Recommends: yast2-ncurses Recommends: yast2-ncurses-pkg Recommends: yast2-vm -Recommends: xorg-x11-xauth -Recommends: virt-install -Recommends: virt-viewer -# BSC#1078908 -Recommends: vim +%if !0%{?is_opensuse} +Provides: patterns-sles-xen_tools = %{version} +Obsoletes: patterns-sles-xen_tools < %{version} +%endif %description xen_tools This will provide all minimal system to get a running XEN Hypervisor @@ -480,8 +467,8 @@ and be able to configure, manage, and monitor virtual machines on a single physical machine. %files xen_tools -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/xen_tools.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/xen_tools.txt %endif ################################################################################ @@ -491,26 +478,26 @@ single physical machine. %build %install -mkdir -p "%{buildroot}/usr/share/doc/packages/patterns" +mkdir -p "%{buildroot}%{_docdir}/patterns" for i in dhcp_dns_server directory_server file_server gateway_server \ lamp_server mail_server printing do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" echo "This file marks the pattern $i-32bit to be installed." \ - >"%{buildroot}/usr/share/doc/packages/patterns/$i-32bit.txt" + >"%{buildroot}%{_docdir}/patterns/$i-32bit.txt" done # NO 32bits pattern for KVM or XEN for i in kvm_tools kvm_server do echo "This file marks the pattern $i to be installed." \ - > "%{buildroot}/usr/share/doc/packages/patterns/$i.txt" + > "%{buildroot}%{_docdir}/patterns/$i.txt" done # XEN is only available on x86_64 %ifarch x86_64 for i in xen_server xen_tools; do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %endif