From 6c9d2022d8cf14eb5fb8487f2bd65b54c7c0af67ece1bcc84c85af7be0bad98e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Feb 2018 08:10:25 +0000 Subject: [PATCH 1/2] - Recommend php7 variants by the lamp pattern (boo#1081072). OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-server?expand=0&rev=9 --- patterns-server.changes | 5 +++++ patterns-server.spec | 38 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/patterns-server.changes b/patterns-server.changes index d07ae8c..d673cce 100644 --- a/patterns-server.changes +++ b/patterns-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 15 08:09:57 UTC 2018 - dimstar@opensuse.org + +- Recommend php7 variants by the lamp pattern (boo#1081072). + ------------------------------------------------------------------- Tue May 23 11:19:08 UTC 2017 - dimstar@opensuse.org diff --git a/patterns-server.spec b/patterns-server.spec index 47fd7e3..f922a3f 100644 --- a/patterns-server.spec +++ b/patterns-server.spec @@ -1,7 +1,7 @@ # # spec file for package patterns-server # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,11 +42,11 @@ This particular package contains all the server related patterns %pattern_serverfunctions Summary: DHCP and DNS Server Group: Metapackages +Provides: patterns-openSUSE-dhcp_dns_server = %{version} Provides: pattern() = dhcp_dns_server Provides: pattern-icon() = yast-dns-server Provides: pattern-order() = 3040 Provides: pattern-visible() -Provides: patterns-openSUSE-dhcp_dns_server = %{version} Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} Requires: pattern() = basesystem @@ -71,11 +71,11 @@ Software to set up a server for the Dynamic Host Configuration Protocol (DHCP) a %pattern_serverfunctions Summary: Directory Server (LDAP) Group: Metapackages +Provides: patterns-openSUSE-directory_server = %{version} Provides: pattern() = directory_server Provides: pattern-icon() = yast-ldap-server Provides: pattern-order() = 3060 Provides: pattern-visible() -Provides: patterns-openSUSE-directory_server = %{version} Obsoletes: patterns-openSUSE-directory_server < %{version} Requires: pattern() = basesystem @@ -101,11 +101,11 @@ Software to set up a directory server with OpenLDAP. The Lightweight Directory A %pattern_serverfunctions Summary: File Server Group: Metapackages +Provides: patterns-openSUSE-file_server = %{version} Provides: pattern() = file_server Provides: pattern-icon() = yast-nfs_server Provides: pattern-order() = 2900 Provides: pattern-visible() -Provides: patterns-openSUSE-file_server = %{version} Obsoletes: patterns-openSUSE-file_server < %{version} Requires: pattern() = basesystem @@ -135,11 +135,11 @@ File services to host files so that they may be accessed or retrieved by other c %pattern_serverfunctions Summary: Internet Gateway Group: Metapackages +Provides: patterns-openSUSE-gateway_server = %{version} Provides: pattern() = gateway_server Provides: pattern-icon() = yast-dsl Provides: pattern-order() = 3020 Provides: pattern-visible() -Provides: patterns-openSUSE-gateway_server = %{version} Obsoletes: patterns-openSUSE-gateway_server < %{version} Requires: pattern() = basesystem @@ -168,11 +168,11 @@ Software to set up a proxy, firewall, and gateway server, including a virtual pr %pattern_serverfunctions Summary: KVM Host Server Group: Metapackages +Provides: patterns-openSUSE-kvm_server = %{version} Provides: pattern() = kvm_server Provides: pattern-icon() = yast-uml Provides: pattern-order() = 3099 Provides: pattern-visible() -Provides: patterns-openSUSE-kvm_server = %{version} Obsoletes: patterns-openSUSE-kvm_server < %{version} Requires: pattern() = basesystem @@ -206,11 +206,11 @@ Software to set up a server for configuring, managing, and monitoring virtual ma %pattern_serverfunctions Summary: Web and LAMP Server Group: Metapackages +Provides: patterns-openSUSE-lamp_server = %{version} Provides: pattern() = lamp_server Provides: pattern-icon() = yast-http-server Provides: pattern-order() = 3000 Provides: pattern-visible() -Provides: patterns-openSUSE-lamp_server = %{version} Obsoletes: patterns-openSUSE-lamp_server < %{version} Requires: pattern() = basesystem @@ -219,18 +219,18 @@ Recommends: yast2-http-server Recommends: apache2-doc Recommends: apache2-example-pages Recommends: apache2-mod_perl -Recommends: apache2-mod_php5 +Recommends: apache2-mod_php7 Recommends: apache2-mod_python Recommends: apache2-prefork Recommends: mariadb -Recommends: php5-ctype -Recommends: php5-dom -Recommends: php5-iconv -Recommends: php5-mysql -Suggests: php5-gd -Suggests: php5-mbstring -Suggests: php5-zlib -Suggests: php5-zip +Recommends: php7-ctype +Recommends: php7-dom +Recommends: php7-iconv +Recommends: php7-mysql +Suggests: php7-gd +Suggests: php7-mbstring +Suggests: php7-zlib +Suggests: php7-zip # slightly out of place I admit Suggests: postgresql Suggests: postgresql-contrib @@ -249,11 +249,11 @@ Software to set up a Web server that is able to serve static, dynamic, and inter %pattern_serverfunctions Summary: Mail and News Server Group: Metapackages +Provides: patterns-openSUSE-mail_server = %{version} Provides: pattern() = mail_server Provides: pattern-icon() = yast-mail-server Provides: pattern-order() = 2980 Provides: pattern-visible() -Provides: patterns-openSUSE-mail_server = %{version} Obsoletes: patterns-openSUSE-mail_server < %{version} Requires: pattern() = basesystem @@ -288,11 +288,11 @@ Software to set up electronic mail and message services to handle email, mailing %pattern_serverfunctions Summary: Print Server Group: Metapackages +Provides: patterns-openSUSE-print_server = %{version} Provides: pattern() = print_server Provides: pattern-icon() = yast-printer Provides: pattern-order() = 2960 Provides: pattern-visible() -Provides: patterns-openSUSE-print_server = %{version} Obsoletes: patterns-openSUSE-print_server < %{version} Requires: pattern() = basesystem @@ -325,11 +325,11 @@ Software used to host print queues so that they may be accessed by other compute %pattern_serverfunctions Summary: Xen Virtual Machine Host Server Group: Metapackages +Provides: patterns-openSUSE-xen_server = %{version} Provides: pattern() = xen_server Provides: pattern-icon() = yast-uml Provides: pattern-order() = 3080 Provides: pattern-visible() -Provides: patterns-openSUSE-xen_server = %{version} Obsoletes: patterns-openSUSE-xen_server < %{version} Requires: pattern() = basesystem From 19aa0aeb1a0688b4efd395345a07f89b2eb3db5059b7bd7d7da9ddd6044a9b18 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Feb 2018 08:12:19 +0000 Subject: [PATCH 2/2] cleeanup OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-server?expand=0&rev=10 --- patterns-server.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patterns-server.spec b/patterns-server.spec index f922a3f..4b19a7c 100644 --- a/patterns-server.spec +++ b/patterns-server.spec @@ -42,11 +42,11 @@ This particular package contains all the server related patterns %pattern_serverfunctions Summary: DHCP and DNS Server Group: Metapackages -Provides: patterns-openSUSE-dhcp_dns_server = %{version} Provides: pattern() = dhcp_dns_server Provides: pattern-icon() = yast-dns-server Provides: pattern-order() = 3040 Provides: pattern-visible() +Provides: patterns-openSUSE-dhcp_dns_server = %{version} Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} Requires: pattern() = basesystem @@ -71,11 +71,11 @@ Software to set up a server for the Dynamic Host Configuration Protocol (DHCP) a %pattern_serverfunctions Summary: Directory Server (LDAP) Group: Metapackages -Provides: patterns-openSUSE-directory_server = %{version} Provides: pattern() = directory_server Provides: pattern-icon() = yast-ldap-server Provides: pattern-order() = 3060 Provides: pattern-visible() +Provides: patterns-openSUSE-directory_server = %{version} Obsoletes: patterns-openSUSE-directory_server < %{version} Requires: pattern() = basesystem @@ -101,11 +101,11 @@ Software to set up a directory server with OpenLDAP. The Lightweight Directory A %pattern_serverfunctions Summary: File Server Group: Metapackages -Provides: patterns-openSUSE-file_server = %{version} Provides: pattern() = file_server Provides: pattern-icon() = yast-nfs_server Provides: pattern-order() = 2900 Provides: pattern-visible() +Provides: patterns-openSUSE-file_server = %{version} Obsoletes: patterns-openSUSE-file_server < %{version} Requires: pattern() = basesystem @@ -135,11 +135,11 @@ File services to host files so that they may be accessed or retrieved by other c %pattern_serverfunctions Summary: Internet Gateway Group: Metapackages -Provides: patterns-openSUSE-gateway_server = %{version} Provides: pattern() = gateway_server Provides: pattern-icon() = yast-dsl Provides: pattern-order() = 3020 Provides: pattern-visible() +Provides: patterns-openSUSE-gateway_server = %{version} Obsoletes: patterns-openSUSE-gateway_server < %{version} Requires: pattern() = basesystem @@ -168,11 +168,11 @@ Software to set up a proxy, firewall, and gateway server, including a virtual pr %pattern_serverfunctions Summary: KVM Host Server Group: Metapackages -Provides: patterns-openSUSE-kvm_server = %{version} Provides: pattern() = kvm_server Provides: pattern-icon() = yast-uml Provides: pattern-order() = 3099 Provides: pattern-visible() +Provides: patterns-openSUSE-kvm_server = %{version} Obsoletes: patterns-openSUSE-kvm_server < %{version} Requires: pattern() = basesystem @@ -206,11 +206,11 @@ Software to set up a server for configuring, managing, and monitoring virtual ma %pattern_serverfunctions Summary: Web and LAMP Server Group: Metapackages -Provides: patterns-openSUSE-lamp_server = %{version} Provides: pattern() = lamp_server Provides: pattern-icon() = yast-http-server Provides: pattern-order() = 3000 Provides: pattern-visible() +Provides: patterns-openSUSE-lamp_server = %{version} Obsoletes: patterns-openSUSE-lamp_server < %{version} Requires: pattern() = basesystem @@ -249,11 +249,11 @@ Software to set up a Web server that is able to serve static, dynamic, and inter %pattern_serverfunctions Summary: Mail and News Server Group: Metapackages -Provides: patterns-openSUSE-mail_server = %{version} Provides: pattern() = mail_server Provides: pattern-icon() = yast-mail-server Provides: pattern-order() = 2980 Provides: pattern-visible() +Provides: patterns-openSUSE-mail_server = %{version} Obsoletes: patterns-openSUSE-mail_server < %{version} Requires: pattern() = basesystem @@ -288,11 +288,11 @@ Software to set up electronic mail and message services to handle email, mailing %pattern_serverfunctions Summary: Print Server Group: Metapackages -Provides: patterns-openSUSE-print_server = %{version} Provides: pattern() = print_server Provides: pattern-icon() = yast-printer Provides: pattern-order() = 2960 Provides: pattern-visible() +Provides: patterns-openSUSE-print_server = %{version} Obsoletes: patterns-openSUSE-print_server < %{version} Requires: pattern() = basesystem @@ -325,11 +325,11 @@ Software used to host print queues so that they may be accessed by other compute %pattern_serverfunctions Summary: Xen Virtual Machine Host Server Group: Metapackages -Provides: patterns-openSUSE-xen_server = %{version} Provides: pattern() = xen_server Provides: pattern-icon() = yast-uml Provides: pattern-order() = 3080 Provides: pattern-visible() +Provides: patterns-openSUSE-xen_server = %{version} Obsoletes: patterns-openSUSE-xen_server < %{version} Requires: pattern() = basesystem