diff --git a/nextcloud.changes b/nextcloud.changes index c56bfe7..e00a254 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 14 10:28:07 UTC 2020 - ecsos + +- Put apache configuration files in separate subpackage. + ------------------------------------------------------------------- Thu Dec 10 12:26:39 UTC 2020 - ecsos diff --git a/nextcloud.spec b/nextcloud.spec index 6fecc99..cbd4f20 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -65,16 +65,10 @@ Source12: %{name}-cron.timer Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - -%if 0%{?suse_version} BuildRequires: apache-rpm-macros -BuildRequires: apache2 >= 2.4 BuildRequires: cron -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif BuildRequires: unzip -%endif # Requires: cron Requires: curl @@ -95,14 +89,10 @@ Requires: php < 7.5.0 Requires: php >= 7.2.0 Requires: php-process Requires: php-xml -# Recommends: sqlite %endif # %if 0%{?suse_version} -Requires: apache2 -Requires: mod_php_any < 7.5.0 -Requires: mod_php_any >= 7.2.0 Requires: php-ctype Requires: php-curl # SUSE does not include the fileinfo module in php-common. @@ -142,6 +132,18 @@ Recommends: php-pcntl Nextcloud is a suite of client-server software for creating file hosting services and using them. +%package apache +Summary: Apache configuration for %{name} +Group: Productivity/Networking/Web/Utilities +BuildRequires: apache2 >= 2.4 +Requires: apache2 +Requires: mod_php_any < 7.5.0 +Requires: mod_php_any >= 7.2.0 +Supplements: packageand(apache2:%name) + +%description apache +This subpackage contains the Apache configuration files + %prep %setup -q -n %{name} cp %{SOURCE2} . @@ -312,7 +314,6 @@ fi %{_unitdir}/%{name}-cron.timer %{apache_myserverroot}/%{name} %attr(-,%{apache_user},%{apache_group}) %{apache_myserverroot}/%{name}/occ -%config(noreplace) %{apache_confdir}/nextcloud.conf %config(noreplace) %{apache_myserverroot}/%{name}/.user.ini %defattr(664,%{apache_user},%{apache_group},775) %{apache_myserverroot}/%{name}/apps @@ -322,4 +323,7 @@ fi %{apache_myserverroot}/%{name}/config %{apache_myserverroot}/%{name}/data +%files apache +%config(noreplace) %{apache_confdir}/nextcloud.conf + %changelog