- packaged vendor dir too

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index b0eb5477cd6b2455cd804996b0676c458b326086..d0f36681d0d2f8fc5983658de7b33c914f568a68 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,16 +4,15 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       4.2.11
+Version:       4.8.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
-Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5: 4d94cf57ad1640aa3faf2288dc250b33
+Source0:       https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5: 946334c6732fe7c5e3d80786794249d1
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-ServerSelectDisplayName.patch
 URL:           http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: tar >= 1:1.22
@@ -25,8 +24,8 @@ Requires:     php(ctype)
 Requires:      php(filter)
 Requires:      php(json)
 Requires:      php(mbstring)
-Requires:      php(mcrypt)
-Requires:      php(mysql)
+#Requires:     php(mcrypt)
+Requires:      php(mysqli)
 Requires:      php(pcre)
 Requires:      php(session)
 Requires:      php(simplexml)
@@ -34,7 +33,6 @@ Requires:     webapps
 Requires:      webserver(access)
 Requires:      webserver(alias)
 Requires(triggerpostun):       sed >= 4.0
-Suggests:      php-mysqli
 Suggests:      webserver(indexfile)
 Suggests:      webserver(php)
 BuildArch:     noarch
@@ -85,7 +83,6 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %prep
 %setup -q -n %{name}-%{version}-all-languages
 %patch0 -p1
-%patch1 -p0
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -95,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
 cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
-cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
+cp -a js libraries locale templates themes vendor $RPM_BUILD_ROOT%{_appdir}
 
 cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
@@ -137,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/js
 %{_appdir}/libraries
 %{_appdir}/locale
+%{_appdir}/templates
 %{_appdir}/themes
 %{_appdir}/*.css
 %{_appdir}/*.php