X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=phpMyAdmin.spec;h=5b18d7851b9fe0c3e6f2274d9bfb22154d93e1d6;hb=5d2058fb7445cc07e6f1cbb8b5bd277c813d7a2f;hp=02a0a124de50feda892b73f5c8c0cf84d8f5e096;hpb=ec70fc7b968ba90bc94c36933ecfe828ff98259f;p=packages%2FphpMyAdmin.git

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 02a0a12..5b18d78 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,34 +1,43 @@
 # 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.1.1
+Version:	4.0.8
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
-Source0:	http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5:	ddfaae7496828983fca2f849ddf3d869
-Source1:	%{name}.conf
+Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5:	c99d13b84b57bd1d97149a60f775bb4e
+Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
+Source3:	%{name}-httpd.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
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+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)
-Requires:	webserver(php)
+Requires(triggerpostun):	sed >= 4.0
 Suggests:	php-mysqli
 Suggests:	webserver(indexfile)
+Suggests:	webserver(php)
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -82,35 +91,18 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 
 %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 -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
+
+install *.php *.css favicon.ico 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
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
-cp -f libraries/import/README{,-import}
-cp -f libraries/transformations/README{,-transformations}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,10 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
@@ -134,7 +126,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
 %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
@@ -142,10 +134,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