From c49806b5b8b561a0c05e92db72be34faeba04963 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Fri, 16 Jul 2021 09:09:36 -0400
Subject: [PATCH] Don't require/recommend Web server configuration

Per OpenSUSE packaging guidelines
---
 dist/rpm/arsse.spec | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/dist/rpm/arsse.spec b/dist/rpm/arsse.spec
index 726caac..f623c42 100644
--- a/dist/rpm/arsse.spec
+++ b/dist/rpm/arsse.spec
@@ -8,9 +8,9 @@ URL:            https://thearsse.com/
 Source0:        %{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-%define phpver 7.1
+%define minver 7.1
 
-Requires:       php >= %{phpver}
+Requires:       php >= %{minver}
 Requires:       php-intl
 Requires:       php-dom
 Requires:       php-simplexml
@@ -22,17 +22,17 @@ Requires:       php-filter
 # The below extensions are part of the PHP core in recent versions
 Requires:       php-hash
 Requires:       php-json
-# A Web server option and database option are required
-Requires:       arsse-conf-www
+# A database option is required; a Web server option is required as well, but what we package is not exhaustive
 Requires:       arsse-conf-db
 
 Recommends:     arsse-sqlite
-Recommends:     arsse-nginx-fpm
 Suggests:       php-curl
 
 Provides:       arsse = %{version}
 Obsoletes:      arsse < %{version}
 
+BuildRequires:  systemd-rpm-macros
+
 %description
 The Arsse bridges the gap between multiple existing newsfeed aggregator
 client protocols such as Tiny Tiny RSS, Nextcloud News and Miniflux,
@@ -41,54 +41,59 @@ server.
 
 %package sqlite
 Summary:        SQLite database configuration for The Arsse
+Group:          Productivity/Networking/Web/Utilities
 Requires:       (php-sqlite or php-pdo_sqlite)
 Requires:       %{name} = %{version}-%{release}
-Conflicts:      arsse-postgresql
+Conflicts:      arsse-pgsql
 Conflicts:      arsse-mysql
-Provides:       arsse-conf-db
+Provides:       arsse-config-db
 Provides:       arsse-sqlite = %{version}
 Obsoletes:      arsse-sqlite < %{version}
 
 %package pgsql
 Summary:        PostgreSQL database configuration for The Arsse
+Group:          Productivity/Networking/Web/Utilities
 Requires:       (php-pgsql or php-pdo_pgsql)
 Requires:       postgresql-server >= 10
 Requires:       %{name} = %{version}-%{release}
 Conflicts:      arsse-sqlite
 Conflicts:      arsse-mysql
-Provides:       arsse-conf-db
+Provides:       arsse-config-db
 Provides:       arsse-pgsql = %{version}
 Obsoletes:      arsse-pgsql < %{version}
 
 %package mysql
 Summary:        MySQL database configuration for The Arsse
+Group:          Productivity/Networking/Web/Utilities
 Requires:       (php-mysql or php-pdo_mysql)
 Requires:       mysql-server >= 8.0
 Requires:       %{name} = %{version}-%{release}
 Conflicts:      arsse-sqlite
-Conflicts:      arsse-postgresql
+Conflicts:      arsse-pgsql
 # OpenSUSE only packages MariaDb, which does not worth with The Arsse
-#Provides:      arsse-conf-db
+#Provides:      arsse-config-db
 Provides:       arsse-mysql = %{version}
 Obsoletes:      arsse-mysql < %{version}
 
-%package nginx-fpm
+%package config-nginx-fpm
 Summary:        Nginx Web server configuration for The Arsse using PHP-FPM
-Requires:       php-fpm >= %{phpver}
+Group:          Productivity/Networking/Web/Utilities
+Requires:       php-fpm >= %{minver}
 Requires:       nginx
 Requires:       %{name} = %{version}-%{release}
-Provides:       arsse-conf-www
 Provides:       arsse-nginx-fpm = %{version}
 Obsoletes:      arsse-nginx-fpm < %{version}
+Supplements:    packageand(apache2:arsse)
 
-%package apache-fpm
+%package config-apache-fpm
 Summary:        Apache Web server configuration for The Arsse using PHP-FPM
-Requires:       php-fpm >= %{phpver}
+Group:          Productivity/Networking/Web/Utilities
+Requires:       php-fpm >= %{minver}
 Requires:       %{name} = %{version}-%{release}
 Requires:       apache >= 2.4
-Provides:       arsse-conf-www
 Provides:       arsse-apache-fpm = %{version}
 Obsoletes:      arsse-apache-fpm < %{version}
+Supplements:    packageand(apache2:arsse)
 
 %prep
 %setup -q -n %{name}
@@ -98,4 +103,5 @@ Obsoletes:      arsse-apache-fpm < %{version}
 # Nothing to do
 
 %install
-
+cp -r lib locale sql vendor www CHANGELOG UPGRADING README.md arsse.php "%{buildroot}/usr/share/php/arsse"
+cp -r manual/* "%{buildroot}/usr/share/doc/arsse"