diff --git a/phpMyAdmin-pma.patch b/phpMyAdmin-pma.patch index 0ae0266..51de6c5 100644 --- a/phpMyAdmin-pma.patch +++ b/phpMyAdmin-pma.patch @@ -17,7 +17,7 @@ Index: config.sample.inc.php =================================================================== --- config.sample.inc.php.orig +++ config.sample.inc.php -@@ -201,7 +201,6 @@ $cfg['Servers'][$i]['savedsearches'] +@@ -199,7 +199,6 @@ $cfg['Servers'][$i]['savedsearches'] $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index af66f78..57123e4 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 5 07:46:47 UTC 2023 - + +- fix deps for subpkg apache + * definitly Requires mod_php_any +- update phpMyAdmin.http + * add missing for php8 + ------------------------------------------------------------------- Wed Feb 8 07:23:38 UTC 2023 - ecsos diff --git a/phpMyAdmin.http b/phpMyAdmin.http index 96035d5..9a8ccca 100644 --- a/phpMyAdmin.http +++ b/phpMyAdmin.http @@ -32,10 +32,16 @@ + # php7 Include @ap_sysconfdir@/conf.d/@name@.inc php_admin_value open_basedir "@ap_docroot@/@name@:@ap_tmpdir@:/var/lib/php7:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat" + # php8 + + Include @ap_sysconfdir@/conf.d/@name@.inc + php_admin_value open_basedir "@ap_docroot@/@name@:@ap_tmpdir@:/var/lib/php8:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat" + diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 4bff0e2..6bec4cf 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -42,6 +42,7 @@ Source100: %{name}-rpmlintrc Patch0: %{name}-config.patch # Fix-SUSE: auto config for pma storage Patch1: %{name}-pma.patch +BuildArch: noarch BuildRequires: apache-rpm-macros BuildRequires: fdupes # @@ -57,7 +58,6 @@ Requires: php-openssl Requires: php-session Recommends: php-curl Recommends: php-zip -BuildArch: noarch %description phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a @@ -105,7 +105,7 @@ Requires(post): %{_sbindir}/a2enmod Requires(post): %{_sbindir}/a2enflag Requires(post): php Requires(postun):%{_sbindir}/a2enflag -Recommends: mod_php_any >= 7.4 +Requires: mod_php_any >= 7.4 Supplements: packageand(apache2:%name) %description apache