[phpMyAdmin] Upgrade to 3.4.7 (#746630, #746880)
Robert Scheck
robert at fedoraproject.org
Sat Nov 5 06:21:07 UTC 2011
commit 1aa83ad0bb07d388a9a96f5900c949a0bf4ba4b3
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sat Nov 5 07:20:54 2011 +0100
Upgrade to 3.4.7 (#746630, #746880)
.gitignore | 2 +-
phpMyAdmin-3.4.7-gettext.patch | 29 +++++++++++++++++++++++++++++
phpMyAdmin.spec | 20 +++++++++++++++++++-
sources | 2 +-
4 files changed, 50 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 71ccb29..f7d3ea3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-phpMyAdmin-3.4.5-all-languages.tar.bz2
+phpMyAdmin-3.4.7-all-languages.tar.bz2
diff --git a/phpMyAdmin-3.4.7-gettext.patch b/phpMyAdmin-3.4.7-gettext.patch
new file mode 100644
index 0000000..e489cf4
--- /dev/null
+++ b/phpMyAdmin-3.4.7-gettext.patch
@@ -0,0 +1,29 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for phpMyAdmin >= 3.4.7, which makes the php-gettext
+library that is used configurable, which is helpful or even required for some vendors or downstreams. The
+default is the internal library to keep backward compatibility. More details can be found at SourceForge:
+https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410
+
+--- phpMyAdmin-3.4.7/libraries/vendor_config.php 2011-09-14 13:48:13.000000000 +0200
++++ phpMyAdmin-3.4.7/libraries/vendor_config.php.gettext 2011-09-25 23:51:55.000000000 +0200
+@@ -59,4 +59,10 @@
+ * Default value for check for version upgrades.
+ */
+ define('VERSION_CHECK_DEFAULT', true);
++
++/**
++ * Path to gettext.inc file. Useful when you want php-gettext somewhere else,
++ * eg. /usr/share/php/gettext/gettext.inc.
++ */
++define('GETTEXT_INC', './libraries/php-gettext/gettext.inc');
+ ?>
+--- phpMyAdmin-3.4.7/libraries/select_lang.lib.php 2011-09-14 13:48:13.000000000 +0200
++++ phpMyAdmin-3.4.7/libraries/select_lang.lib.php.gettext 2011-09-25 23:54:41.000000000 +0200
+@@ -373,7 +373,7 @@
+ /**
+ * Load gettext functions.
+ */
+-require './libraries/php-gettext/gettext.inc';
++require GETTEXT_INC;
+
+ /**
+ * @global string interface language
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 07bbd9b..62a5a21 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,8 +1,9 @@
%define pkgname phpMyAdmin
+%define gettext 1
Summary: Handle the administration of MySQL over the World Wide Web
Name: phpMyAdmin
-Version: 3.4.5
+Version: 3.4.7
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
@@ -10,11 +11,18 @@ URL: http://www.phpmyadmin.net/
Source0: http://downloads.sourceforge.net/sourceforge/%{pkgname}/%{pkgname}-%{version}-all-languages.tar.bz2
Source1: phpMyAdmin-config.inc.php
Source2: phpMyAdmin.htaccess
+Patch0: phpMyAdmin-3.4.7-gettext.patch
%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
+%if %{gettext}
+Requires: php-php-gettext
+%endif
%else
Requires: httpd, php53, php53-mysql, php53-mcrypt, php53-mbstring, php53-gd
+%if %{gettext}
+Requires: php53-php-gettext
+%endif
Provides: phpMyAdmin = %{version}-%{release}
%endif
Provides: phpmyadmin = %{version}-%{release}
@@ -49,6 +57,9 @@ sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_datadir}/doc/%{name}-%{version}/Chang
-e "/'LICENSE_FILE'/s at ./LICENSE@%{_datadir}/doc/%{name}-%{version}/LICENSE@" \
-e "/'CONFIG_DIR'/s@'./'@'%{_sysconfdir}/%{pkgname}/'@" \
-e "/'SETUP_CONFIG_FILE'/s at ./config/config.inc.php@%{_localstatedir}/lib/%{pkgname}/config/config.inc.php@" \
+%if %{gettext}
+ -e "/'GETTEXT_INC'/s at ./libraries/php-gettext/gettext.inc@%{_datadir}/php/gettext/gettext.inc@" \
+%endif
-i libraries/vendor_config.php
%build
@@ -65,6 +76,10 @@ 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
+%if %{gettext}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/libraries/php-gettext/
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -81,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{pkgname}/config
%changelog
+* Sat Nov 05 2011 Robert Scheck <robert at fedoraproject.org> 3.4.7-1
+- Upgrade to 3.4.7 (#746630, #746880)
+
* Sun Sep 18 2011 Robert Scheck <robert at fedoraproject.org> 3.4.5-1
- Upgrade to 3.4.5 (#733638, #738681, #629214)
diff --git a/sources b/sources
index c0017b2..18641f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b86208e2062d85020624b75dd50ef1be phpMyAdmin-3.4.5-all-languages.tar.bz2
+9bb191e13f691577f184f6cc58091414 phpMyAdmin-3.4.7-all-languages.tar.bz2
More information about the scm-commits
mailing list