use composer-generatorsHEADmaster

1 files changed, 14 insertions, 18 deletions

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 24fdedf..fcf99e6 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,7 +1,7 @@
 # remirepo:3
 # remirepo spec file for phpMyAdmin
 #
-# Copyright (c) 2008-2023 Remi Collet
+# Copyright (c) 2008-2024 Remi Collet
 #
 # Fedora spec file for phpMyAdmin
 #
@@ -10,26 +10,20 @@
 #
 # Please, preserve the changelog entries
 #
-%{!?_pkgdocdir: %global _pkgdocdir %{_datadir}/doc/%{name}-%{version}}
 
-# remirepo:1
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+%bcond_with generators
+
 # nginx 1.6 with nginx-filesystem
 %global with_nginx     1
 # httpd 2.4 with httpd-filesystem
 %global with_httpd     1
-# remirepo:4
-%else
-%global with_nginx     0
-%global with_httpd     0
-%endif
 
 %global upstream_version 5.2.1
 #global upstream_prever  rc1
 
 Name: phpMyAdmin
 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A web interface for MySQL and MariaDB
 
 # phpMyAdmin is GPL-2.0-or-later
@@ -55,6 +49,9 @@ BuildRequires: gnupg2
 BuildRequires: php(language) >= 7.2.5
 BuildRequires: php-cli
 BuildRequires: php-json
+%if %{with generators}
+BuildRequires: composer-generators
+%endif
 
 Requires(post): coreutils sed
 Requires:  webserver
@@ -105,6 +102,7 @@ Requires:  php-openssl
 Requires:  php-pcre
 Requires:  php-xml
 
+%if %{without generators}
 # License BSD-2-Clause
 Provides:  bundled(php-bacon-bacon-qr-code) = 2.0.8
 Provides:  bundled(php-beberlei-assert) = v3.3.2
@@ -168,6 +166,9 @@ Provides:  bundled(php-web-auth-webauthn-lib) = v3.3.12
 Provides:  bundled(php-webmozart-assert) = 1.11.0
 # License MPL-2.0
 Provides:  bundled(php-williamdes-mariadb-mysql-kbs) = v1.2.14
+# main package
+Provides:  php-composer(phpmyadmin/phpmyadmin) = %{version}
+%endif
 
 Requires:  php-dom
 Requires:  php-intl
@@ -199,12 +200,6 @@ Provides:  bundled(js-jquery) = 3.2.1
 Provides:  bundled(js-openlayers)
 Provides:  bundled(js-tracekit)
 
-Provides:  php-composer(phpmyadmin/phpmyadmin) = %{version}
-# remirepo:4
-# Update from other 3rd party
-Obsoletes: phpMyAdmin50 <= %{version}
-Obsoletes: phpMyAdmin49 <= %{version}
-Obsoletes: phpmyadmin   <  %{version}
 # Allow lowercase in install command
 Provides:  phpmyadmin   =  %{version}-%{release}
 
@@ -221,7 +216,7 @@ is available in 50 languages
 %{?gpgverify:%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'}
 
 %setup -qn phpMyAdmin-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages
-%patch0 -p1
+%patch -P0 -p1
 rm -r vendor/composer/ca-bundle/res/
 
 # Minimal configuration file
@@ -245,7 +240,9 @@ sed -e "/'changeLogFile'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
 # For debug
 grep '=>' libraries/vendor_config.php
 
+%if %{without generators}
 php %{SOURCE5} vendor/composer/installed.json
+%endif
 
 
 %build
@@ -304,7 +301,6 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE*
 %doc ChangeLog README CONTRIBUTING.md config.sample.inc.php
 %doc doc/html/