summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-04 17:25:57 +0200
committerRemi Collet <remi@remirepo.net>2020-04-04 17:25:57 +0200
commitf42dcd1fd353a80d355a22c32b8ca4188d9d7d71 (patch)
tree601e82b7984440b3734b0e7b0c531f1ffc09d1ce
parent5e11d323aca6b3fd9f07e5f4ca35c67719d1a265 (diff)
temporarily make nginx-filesystem optional toHEADmaster
allow installation with nginx from nginx repository
-rw-r--r--phpMyAdmin.spec15
1 files changed, 13 insertions, 2 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 62df4c2..4768455 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -28,7 +28,7 @@
Name: phpMyAdmin
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A web interface for MySQL and MariaDB
# MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/)
@@ -53,7 +53,14 @@ BuildRequires: gnupg2
Requires(post): coreutils sed
Requires: webserver
%if %{with_nginx}
-Requires: nginx-filesystem
+# remirepo:4
+# Temporarily not mandatory to allow nginx for nginx repo
+%if 1
+Recommends: nginx-filesystem
+%else
+Requires: nginx-filesystem
+# remirepo:1
+%endif
%endif
%if %{with_httpd}
Requires: httpd-filesystem
@@ -340,6 +347,10 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Sat Apr 4 2020 Remi Collet <remi@remirepo.net> 5.0.2-3
+- temporarily make nginx-filesystem optional to
+ allow installation with nginx from nginx repository
+
* Tue Mar 24 2020 Remi Collet <remi@remirepo.net> 5.0.2-2
- cleanup httpd configuration