- fix files

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 7329d03c7c68369fe8718964a87f80cb95db5e5d..d4e0c4bd62848bf0383d8bf7374047ab52b3ce65 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,11 +1,9 @@
-# TODO
-# - add codepress (http://codepress.org/index.php) patch
-# - use system jquery (js/jquery), tcpdf (libraries/tcpdf) and php-gettext (libraries/gettext)
+%define        _noautoreqfiles vendor/paragonie/random_compat/psalm-autoload.php
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
 Version:       5.0.2
-Release:       1
+Release:       3
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
@@ -14,6 +12,7 @@ Source1:      %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-disable-version-check.patch
+Patch2:                %{name}-env.patch
 URL:           http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: tar >= 1:1.22
@@ -85,6 +84,7 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -93,7 +93,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/tmp}
 
-cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -p *.php *.css *.json *.lock *.yml favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
 cp -a js libraries locale sql templates themes vendor $RPM_BUILD_ROOT%{_appdir}
 
 cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
@@ -143,5 +143,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/vendor
 %{_appdir}/*.css
 %{_appdir}/*.php
+%{_appdir}/*.json
+%{_appdir}/*.lock
+%{_appdir}/*.yml
 %{_appdir}/favicon.ico
 %{_appdir}/robots.txt