From 14fdba441844c631afa8946c4322bbdc16a23ecb Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 12 Dec 2013 07:06:14 +0100
Subject: phpMyAdmin: 4.1.0 final

---
 phpMyAdmin.spec | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'phpMyAdmin.spec')

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 08d0654..bfaaa9a 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,7 +1,7 @@
-#global prever rc1
+#global prever rc3
 
 Name: phpMyAdmin
-Version: 4.0.10
+Version: 4.1.0
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -11,15 +11,12 @@ URL: http://www.phpmyadmin.net/
 Source0: http://downloads.sourceforge.net/sourceforge/phpmyadmin/%{name}-%{version}%{?prever:-%prever}-all-languages.tar.bz2
 Source2: phpMyAdmin.htaccess
 
-# https://github.com/phpmyadmin/phpmyadmin/pull/357
-Patch0: %{name}-vendor.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: unzip
 
 Requires:  webserver
-Requires:  php(language) >= 5.2.0
+Requires:  php(language) >= 5.3.0
 Requires:  php-bcmath
 Requires:  php-bz2
 Requires:  php-ctype
@@ -35,11 +32,14 @@ Requires:  php-libxml
 Requires:  php-mbstring
 Requires:  php-mcrypt
 Requires:  php-mysqli
+Requires:  php-openssl
 Requires:  php-pcre
 Requires:  php-recode
 Requires:  php-session
 Requires:  php-simplexml
 Requires:  php-spl
+Requires:  php-tidy
+Requires:  php-xml
 Requires:  php-xmlwriter
 Requires:  php-zip
 Requires:  php-zlib
@@ -62,8 +62,6 @@ is available in 50 languages
 %prep
 %setup -qn phpMyAdmin-%{version}%{?prever:-%prever}-all-languages
 
-%patch0 -p1
-
 # Minimal configuration file
 sed -e "/'extension'/s@'mysql'@'mysqli'@"  \
     -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@"  \
@@ -142,7 +140,7 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README LICENSE
+%doc ChangeLog README LICENSE CONTRIBUTING.md
 %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
@@ -153,9 +151,21 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN
 
 
 %changelog
+* Thu Dec 12 2013 Remi Collet <rpms@famillecollet.com> 4.1.0-1
+- update to 4.0.1 final
+
+* Sat Dec  7 2013 Remi Collet <rpms@famillecollet.com> 4.1.0-0.3.rc3
+- update to 4.1.0-rc3
+
+* Wed Dec  4 2013 Remi Collet <rpms@famillecollet.com> 4.1.0-0.2.rc2
+- update to 4.1.0-rc2
+
 * Wed Dec  4 2013 Remi Collet <rpms@famillecollet.com> 4.0.10-1
 - update to 4.0.10 (bugfix)
 
+* Sat Nov 23 2013 Remi Collet <rpms@famillecollet.com> 4.1.0-0.1.rc1
+- update to 4.1.0-rc1
+
 * Tue Nov  5 2013 Remi Collet <rpms@famillecollet.com> 4.0.9-1
 - update to 4.0.9 (bugfix)
 
-- 
cgit