X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=phpMyAdmin.spec;h=d640a6ad035e272f7244b51bf492aa1acb1955ec;hb=07641010af7cc8663b115caaa243033dc8d1e32c;hp=5e438a113423cffece4e5903cd0e1e225920e9ac;hpb=36a6e5f5f2da71330d94dbe30534a7b081af06fb;p=packages%2FphpMyAdmin.git

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 5e438a1..d640a6a 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,14 +1,15 @@
 # TODO
 # - add codepress (http://codepress.org/index.php) patch
+# - use system jquery (js/jquery), tcpdf (libraries/tcpdf) and php-gettext (libraries/gettext)
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
-Version:	3.4.10.2
+Version:	3.5.6
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5:	c4099c9b810065644e34a2a2e5de22f5
+# Source0-md5:	0aa0125c5b31364aea29dff99a1df684
 Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
@@ -17,16 +18,16 @@ Patch2:		%{name}-ServerSelectDisplayName-config.patch
 URL:		http://www.phpmyadmin.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	sed >= 4.0
-Requires:	php-common >= 4:5.2
-Requires:	php-ctype
-Requires:	php-filter
-Requires:	php-json
-Requires:	php-mbstring
-Requires:	php-mcrypt
-Requires:	php-mysql
-Requires:	php-pcre
-Requires:	php-session
-Requires:	php-simplexml
+Requires:	php(core) >= 5.2
+Requires:	php(ctype)
+Requires:	php(filter)
+Requires:	php(json)
+Requires:	php(mbstring)
+Requires:	php(mcrypt)
+Requires:	php(mysql)
+Requires:	php(pcre)
+Requires:	php(session)
+Requires:	php(simplexml)
 Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
@@ -88,8 +89,8 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-install *.php *.html *.css $RPM_BUILD_ROOT%{_appdir}
-cp -a locale pmd themes js libraries $RPM_BUILD_ROOT%{_appdir}
+install *.php *.html *.css robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
 
 install libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
@@ -124,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Documentation.* CREDITS ChangeLog INSTALL README TODO scripts libraries/import/README-import libraries/transformations/README-transformations libraries/transformations/TEMPLATE* libraries/transformations/*.sh
+%doc Documentation.* ChangeLog README README.VENDOR libraries/import/README-import libraries/transformations/README-transformations libraries/transformations/TEMPLATE* libraries/transformations/*.sh
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -134,8 +135,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/js
 %{_appdir}/libraries
 %{_appdir}/locale
-%{_appdir}/pmd
 %{_appdir}/themes
 %{_appdir}/*.css
 %{_appdir}/*.html
 %{_appdir}/*.php
+%{_appdir}/robots.txt