From 5e1e03743e9f3584013b8b106d37cf01186724110b6c3da9d2f820b568ea55ed Mon Sep 17 00:00:00 2001
From: Arjen de Korte <suse+build@de-korte.org>
Date: Tue, 22 Dec 2020 16:32:42 +0000
Subject: [PATCH] Accepting request 855749 from home:ecsos:server

- Update to 7.13.0
  - Add support for Postgres 13
  - Add provisional support for Postgres 14
  - Upgrade Jquery library to 3.4.1
  - Allow users to see group owned databases when using "owned only"
  - Fix bug where sorting on selects dumped you to the table screen
  - This release drops support for PHP 7.1
  - This will be the last release to support PHP 7.2
- Put apache configuration files in separate subpackage.

OBS-URL: https://build.opensuse.org/request/show/855749
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpPgAdmin?expand=0&rev=30
---
 phpPgAdmin-7.12.1.tar.bz2 |  3 ---
 phpPgAdmin-7.13.0.tar.bz2 |  3 +++
 phpPgAdmin.changes        | 13 +++++++++++++
 phpPgAdmin.spec           | 29 ++++++++++++++++++++---------
 4 files changed, 36 insertions(+), 12 deletions(-)
 delete mode 100644 phpPgAdmin-7.12.1.tar.bz2
 create mode 100644 phpPgAdmin-7.13.0.tar.bz2

diff --git a/phpPgAdmin-7.12.1.tar.bz2 b/phpPgAdmin-7.12.1.tar.bz2
deleted file mode 100644
index a254a7b..0000000
--- a/phpPgAdmin-7.12.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a871af0e4b60dde4e4489162ea1bd6bead00267d9db5428289afc892b5dfdbd5
-size 579723
diff --git a/phpPgAdmin-7.13.0.tar.bz2 b/phpPgAdmin-7.13.0.tar.bz2
new file mode 100644
index 0000000..462ed45
--- /dev/null
+++ b/phpPgAdmin-7.13.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc9a5d74c49330af65664b3fd145df2b76c63f946e0de86e306b308ad104939c
+size 620530
diff --git a/phpPgAdmin.changes b/phpPgAdmin.changes
index 62e4f02..e71d304 100644
--- a/phpPgAdmin.changes
+++ b/phpPgAdmin.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Dec 14 12:13:12 UTC 2020 - ecsos <ecsos@opensuse.org>
+
+- Update to 7.13.0
+  - Add support for Postgres 13
+  - Add provisional support for Postgres 14
+  - Upgrade Jquery library to 3.4.1
+  - Allow users to see group owned databases when using "owned only"
+  - Fix bug where sorting on selects dumped you to the table screen
+  - This release drops support for PHP 7.1
+  - This will be the last release to support PHP 7.2
+- Put apache configuration files in separate subpackage.
+
 -------------------------------------------------------------------
 Tue Dec  1 15:04:30 UTC 2020 - pgajdos@suse.com
 
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 6f24e8a..d4ffc23 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -26,9 +26,9 @@ Name:           phpPgAdmin
 Summary:        Administration of PostgreSQL over the web
 License:        GPL-2.0-or-later
 Group:          Productivity/Databases/Tools
-Version:        7.12.1
+Version:        7.13.0
 Release:        0
-%define rel_version REL_7-12-1
+%define rel_version REL_7-13-0
 URL:            http://phppgadmin.sourceforge.net
 Source0:        https://github.com/%{lc_name}/%{lc_name}/releases/download/%{rel_version}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.http
@@ -37,10 +37,8 @@ Patch0:         %{name}-config.inc.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache-rpm-macros
-BuildRequires:  apache2
 BuildRequires:  fdupes
-Requires:       mod_php_any
-Requires:       php >= 7.1
+Requires:       php >= 7.2
 Requires:       php-pgsql
 
 %description
@@ -71,6 +69,17 @@ Features
 	o No encoding conflicts. Edit Russian data using a Japanese interface!
 * Easy to install and configure
 
+%package apache
+Summary:        Apache configuration for %{name}
+Group:          Productivity/Networking/Web/Utilities
+BuildRequires:  apache2
+Requires:       apache2
+Requires:       mod_php_any
+Supplements:    packageand(apache2:%name)
+
+%description apache
+This subpackage contains the Apache configuration files
+
 %prep
 %setup -q
 %patch0
@@ -106,7 +115,7 @@ find %{buildroot}%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc
 # rpmlint stuff
 %fdupes %{buildroot}%{ap_docroot}/%{name}
 
-%post
+%post apache
 # enable phpPgAdmin flag
 if [ -x %{_sbindir}/a2enflag ]; then
   flag_find=$(grep -cw /etc/sysconfig/apache2 -e "^APACHE_SERVER_FLAGS=.*%{name}.*")
@@ -129,7 +138,7 @@ if [ $find -gt 0 ]; then
 fi
 %restart_on_update apache2
 
-%postun
+%postun apache
 # only do on uninstall, not on update
 if [ $1 -eq 0 ]; then
   # disable phpPgAdmin flag
@@ -148,9 +157,11 @@ fi
 %doc CREDITS DEVELOPERS FAQ HISTORY TODO TRANSLATORS
 %license LICENSE
 %dir %{ap_docroot}/%{name}
-%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf
-%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.inc
 %dir %attr(0750,wwwrun,root) %{_sysconfdir}/%{name}
 %config(noreplace) %attr(0640,root,www) %{ppa_config}
 
+%files apache
+%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf
+%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.inc
+
 %changelog