X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=phpMyAdmin.spec;h=c4a2dc5486fdd888cb738c003b61e5212f140e38;hb=bb3161d79a6fc6bc95162b19fe2862048286471a;hp=59134877878a7a49eac7e29bc7f4cb6dfd111eb5;hpb=77495eda4d530a7913f9e94303ca8408231410c9;p=packages%2FphpMyAdmin.git

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 5913487..c4a2dc5 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,33 +1,40 @@
 # 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.3.10
+Version:	4.1.9
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
-Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5:	cb7a632fb4f10a180ead15f7f90087f1
-Source1:	%{name}.conf
+Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5:	420c836228ceab8df5557c92e56021d7
+Source1:	apache.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-ServerSelectDisplayName.patch
 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-mbstring
-Requires:	php-mcrypt
-Requires:	php-mysql
-Requires:	php-pcre
-Requires:	php-session
-Requires:	php-simplexml
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+# phpMyAdmin doesn't support mysql < 5.5 and won't work with php < 5.3
+Requires:	mysql-libs >= 5.5
+Requires:	php(core) >= 5.3
+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)
+Requires(triggerpostun):	sed >= 4.0
 Suggests:	php-mysqli
 Suggests:	webserver(indexfile)
 Suggests:	webserver(php)
@@ -82,36 +89,22 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 %patch1 -p0
 %patch2 -p0
 
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{js,lang,libraries/{auth/swekey,dbg,dbi,engines,export,tcpdf/font,import,transformations}}}
-
-install *.php *.html *.css $RPM_BUILD_ROOT%{_appdir}
-install lang/*.php $RPM_BUILD_ROOT%{_appdir}/lang
-cp -rf pmd $RPM_BUILD_ROOT%{_appdir}
-cp -rf themes $RPM_BUILD_ROOT%{_appdir}
-cp -rf js $RPM_BUILD_ROOT%{_appdir}
-install libraries/*.php $RPM_BUILD_ROOT%{_appdir}/libraries
-install libraries/auth/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/auth
-install libraries/auth/swekey/*.{php,crt} $RPM_BUILD_ROOT%{_appdir}/libraries/auth/swekey
-install libraries/dbg/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/dbg
-install libraries/dbi/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/dbi
-install libraries/engines/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/engines
-install libraries/export/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/export
-install libraries/import/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/import
-install libraries/tcpdf/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/tcpdf
-install libraries/tcpdf/font/*.{php,z} $RPM_BUILD_ROOT%{_appdir}/libraries/tcpdf/font
-install libraries/transformations/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/transformations
-
-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
+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}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+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
 
-cp -f libraries/import/README{,-import}
-cp -f libraries/transformations/README{,-transformations}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -136,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Documentation.* CREDITS ChangeLog INSTALL README TODO translators.html scripts libraries/import/README-import libraries/transformations/README-transformations libraries/transformations/TEMPLATE* libraries/transformations/*.sh lang/*.sh
+%doc ChangeLog README examples
 %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
@@ -144,10 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
 %dir %{_appdir}
 %{_appdir}/js
-%{_appdir}/lang
 %{_appdir}/libraries
-%{_appdir}/pmd
+%{_appdir}/locale
 %{_appdir}/themes
 %{_appdir}/*.css
-%{_appdir}/*.html
 %{_appdir}/*.php
+%{_appdir}/favicon.ico
+%{_appdir}/robots.txt