rpm/phpMyAdmin
SHA256
1
0
Fork 0
forked from pool/phpMyAdmin
Code Pull Requests Activity

Accepting request 1084972 from home:computersalat:devel:php

Browse Source 
fix deps, update apache conf

OBS-URL: https://build.opensuse.org/request/show/1084972
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=381
This commit is contained in:
Christian Wittmer 2023-05-05 08:37:52 +00:00 committed by Git OBS Bridge
parent f72c5e8e04
commit e824729c65
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpMyAdmin-pma.patch
View File

@ -17,7 +17,7 @@ Index: config.sample.inc.php
=================================================================== ===================================================================
--- config.sample.inc.php.orig --- config.sample.inc.php.orig
+++ config.sample.inc.php +++ 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]['central_columns'] = 'pma__central_columns';
$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';

8
phpMyAdmin.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri May 5 07:46:47 UTC 2023 - <chris@computersalat.de>
- fix deps for subpkg apache
* definitly Requires mod_php_any
- update phpMyAdmin.http
* add missing <IfModule mod_php.c> for php8
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 07:23:38 UTC 2023 - ecsos <ecsos@opensuse.org> Wed Feb 8 07:23:38 UTC 2023 - ecsos <ecsos@opensuse.org>

6
phpMyAdmin.http
View File

@ -32,10 +32,16 @@
</IfModule> </IfModule>
</IfVersion> </IfVersion>
# php7
<IfModule mod_php7.c> <IfModule mod_php7.c>
Include @ap_sysconfdir@/conf.d/@name@.inc 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" php_admin_value open_basedir "@ap_docroot@/@name@:@ap_tmpdir@:/var/lib/php7:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat"
</IfModule> </IfModule>
# php8
<IfModule mod_php.c>
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"
</IfModule>
</Directory> </Directory>

4
phpMyAdmin.spec
View File

@ -42,6 +42,7 @@ Source100: %{name}-rpmlintrc
Patch0: %{name}-config.patch Patch0: %{name}-config.patch
# Fix-SUSE: auto config for pma storage # Fix-SUSE: auto config for pma storage
Patch1: %{name}-pma.patch Patch1: %{name}-pma.patch
BuildArch: noarch
BuildRequires: apache-rpm-macros BuildRequires: apache-rpm-macros
BuildRequires: fdupes BuildRequires: fdupes
# #
@ -57,7 +58,6 @@ Requires: php-openssl
Requires: php-session Requires: php-session
Recommends: php-curl Recommends: php-curl
Recommends: php-zip Recommends: php-zip
BuildArch: noarch
%description %description
phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a 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): %{_sbindir}/a2enflag
Requires(post): php Requires(post): php
Requires(postun):%{_sbindir}/a2enflag Requires(postun):%{_sbindir}/a2enflag
Recommends: mod_php_any >= 7.4 Requires: mod_php_any >= 7.4
Supplements: packageand(apache2:%name) Supplements: packageand(apache2:%name)
%description apache %description apache