[phpMyAdmin] Upgrade to 3.4.4 (#733475, #733477, #733480)

[Robert Scheck]

commit fb3b626b916087811f3513ca0d6dcc78f05f4f33
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Aug 25 22:19:45 2011 +0200

    Upgrade to 3.4.4 (#733475, #733477, #733480)

 .gitignore      |    2 +-
 phpMyAdmin.spec |   59 ++++++++++++++++++++++++++++++++++--------------------
 sources         |    2 +-
 3 files changed, 39 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0bdf15..8369636 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-phpMyAdmin-3.4.3.2-all-languages.tar.bz2
+phpMyAdmin-3.4.4-all-languages.tar.bz2
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 9148700..5f23d0e 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,15 +1,26 @@
+%define pkgname	phpMyAdmin
+
 Summary:	Handle the administration of MySQL over the World Wide Web
+%if 0%{?rhel} != 5
 Name:		phpMyAdmin
-Version:	3.4.3.2
-Release:	2%{?dist}
+%else
+Name:		phpMyAdmin3
+%endif
+Version:	3.4.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.phpmyadmin.net/
-Source0:	http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
+Source0:	http://downloads.sourceforge.net/sourceforge/%{pkgname}/%{pkgname}-%{version}-all-languages.tar.bz2
 Source1:	phpMyAdmin-config.inc.php
 Source2:	phpMyAdmin.htaccess
+%if 0%{?rhel} != 5
 Requires:	httpd, php >= 5.2.0, php-mysql >= 5.2.0, php-mcrypt >= 5.2.0
 Requires:	php-mbstring >= 5.2.0, php-gd >= 5.2.0
+%else
+Requires:	httpd, php53, php53-mysql, php53-mcrypt, php53-mbstring, php53-gd
+Provides:	phpMyAdmin = %{version}-%{release}
+%endif
 Provides:	phpmyadmin = %{version}-%{release}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,28 +46,28 @@ transforming stored data into any format using a set of predefined functions,
 like displaying BLOB-data as image or download-link and much more...
 
 %prep
-%setup -q -n %{name}-%{version}-all-languages
+%setup -q -n %{pkgname}-%{version}-all-languages
 
 # Setup vendor config file
 sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_datadir}/doc/%{name}-%{version}/ChangeLog@" \
     -e "/'LICENSE_FILE'/s at ./LICENSE@%{_datadir}/doc/%{name}-%{version}/LICENSE@" \
-    -e "/'CONFIG_DIR'/s@'./'@'%{_sysconfdir}/%{name}/'@" \
-    -e "/'SETUP_CONFIG_FILE'/s at ./config/config.inc.php@%{_localstatedir}/lib/%{name}/config/config.inc.php@" \
+    -e "/'CONFIG_DIR'/s@'./'@'%{_sysconfdir}/%{pkgname}/'@" \
+    -e "/'SETUP_CONFIG_FILE'/s at ./config/config.inc.php@%{_localstatedir}/lib/%{pkgname}/config/config.inc.php@" \
     -i libraries/vendor_config.php
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/{httpd/conf.d,%{name}}}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/{upload,save,config}
-cp -ad * $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php
+mkdir -p $RPM_BUILD_ROOT{%{_datadir}/%{pkgname},%{_sysconfdir}/{httpd/conf.d,%{pkgname}}}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{pkgname}/{upload,save,config}
+cp -ad * $RPM_BUILD_ROOT%{_datadir}/%{pkgname}
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{pkgname}.conf
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{pkgname}/config.inc.php
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{[CIRLT]*,*txt}
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{libraries,setup/{lib,frames}}/.htaccess
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/{[CIRLT]*,*txt}
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/{libraries,setup/{lib,frames}}/.htaccess
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/contrib
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,18 +75,22 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README LICENSE CREDITS TODO Documentation.txt
-%{_datadir}/%{name}/
-%dir %{_sysconfdir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%dir %{_localstatedir}/lib/%{name}/
-%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/upload
-%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/save
-%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/config
+%{_datadir}/%{pkgname}/
+%dir %{_sysconfdir}/%{pkgname}/
+%config(noreplace) %{_sysconfdir}/%{pkgname}/config.inc.php
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{pkgname}.conf
+%dir %{_localstatedir}/lib/%{pkgname}/
+%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{pkgname}/upload
+%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{pkgname}/save
+%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{pkgname}/config
 
 %changelog
+* Thu Aug 25 2011 Robert Scheck <robert at fedoraproject.org> 3.4.4-1
+- Upgrade to 3.4.4 (#733475, #733477, #733480)
+
 * Tue Jul 26 2011 Robert Scheck <robert at fedoraproject.org> 3.4.3.2-2
 - Disabled the warning for missing internal database relation
+- Reworked spec file to build phpMyAdmin3 for RHEL 5 (#725885)
 
 * Mon Jul 25 2011 Robert Scheck <robert at fedoraproject.org> 3.4.3.2-1
 - Upgrade to 3.4.3.2 (#725377, #725381, #725382, #725383, #725384)
diff --git a/sources b/sources
index a16191f..7ab8bc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9905538aa08d6dc9029a3f8d9e7fe8ea  phpMyAdmin-3.4.3.2-all-languages.tar.bz2
+590c8f0f48b82fc188436b51f998374f  phpMyAdmin-3.4.4-all-languages.tar.bz2