- updated to 2.8.1 (minor security fixes)

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 4f318f3bf4d9a0f632ae8745bef82adb1ec6b072..d1b7635edd04edafc024978c04cfb128f8a702a8 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,19 +1,16 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl):   phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       2.7.0
-%define                _pl     pl2
-# release 1 is for Ra
-%define                _rel 2
-Release:       %{_pl}.%{_rel}
+Version:       2.8.1
+Release:       1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
-Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_pl}.tar.bz2
-# Source0-md5: 19a46b06254276f4e7c3803ea2d9b335
-#Source0:      http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}.tar.bz2
+Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}.tar.bz2
+# Source0-md5: 82d7ed4a71608fd7eeef5510c4a49056
 Source1:       %{name}.conf
 Patch0:                %{name}-config.patch
 URL:           http://www.phpmyadmin.net/
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       sed >= 4.0
 Requires:      php
 Requires:      php-mysql
@@ -63,25 +60,30 @@ podr
 - tworzyæ i czytaæ zrzuty tabel
 
 %prep
-%setup -q -n %{name}-%{version}-%{_pl}
+%setup -q
 %patch -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{css,lang,libraries/{auth,export,dbg,dbi,transformations}}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{css,js,lang,libraries/{auth,dbg,dbi,engines,export,fpdf/font,import,transformations}}}
 
 install *.php *.html *.css $RPM_BUILD_ROOT%{_appdir}
 install lang/*.php $RPM_BUILD_ROOT%{_appdir}/lang
 cp -rf themes $RPM_BUILD_ROOT%{_appdir}
 install css/* $RPM_BUILD_ROOT%{_appdir}/css
-install libraries/*.{js,php} $RPM_BUILD_ROOT%{_appdir}/libraries
+install js/* $RPM_BUILD_ROOT%{_appdir}/js
+install libraries/*.php $RPM_BUILD_ROOT%{_appdir}/libraries
 install libraries/auth/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/auth
-install libraries/export/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/export
 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/fpdf/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/fpdf
+install libraries/fpdf/font/*.{php,z} $RPM_BUILD_ROOT%{_appdir}/libraries/fpdf/font
+install libraries/import/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/import
 install libraries/transformations/*.php $RPM_BUILD_ROOT%{_appdir}/libraries/transformations
 
-install config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
+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
@@ -96,10 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- phpMyAdmin <= 2.5.3-2
@@ -138,9 +140,7 @@ fi
 
 rm -f /etc/httpd/httpd.conf/99_%{name}.conf
 /usr/sbin/webapp register httpd %{_webapp}
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd reload 1>&2
-fi
+%service httpd reload
 
 %files
 %defattr(644,root,root,755)
@@ -151,9 +151,10 @@ fi
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
 %dir %{_appdir}
 %{_appdir}/css
-%{_appdir}/themes
+%{_appdir}/js
 %{_appdir}/lang
 %{_appdir}/libraries
+%{_appdir}/themes
 %{_appdir}/*.css
 %{_appdir}/*.html
 %{_appdir}/*.php