From 46096328d90c118c0eee7b62076ee79057943eec Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 15 May 2013 09:34:28 +0200
Subject: phpMyAdmin: 4.0.1

---
 phpMyAdmin-vendor.patch | 82 -------------------------------------------------
 phpMyAdmin.spec         |  7 +++--
 2 files changed, 5 insertions(+), 84 deletions(-)

diff --git a/phpMyAdmin-vendor.patch b/phpMyAdmin-vendor.patch
index bb3cb85..d744dac 100644
--- a/phpMyAdmin-vendor.patch
+++ b/phpMyAdmin-vendor.patch
@@ -1,85 +1,3 @@
-From 7ae3edc9a0f09e2f70c4d2a425e4a77fcb642de5 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Thu, 9 May 2013 18:24:06 +0200
-Subject: [PATCH] add tcpdf path to vendor_config.php
-
----
- libraries/PDF.class.php     | 2 +-
- libraries/vendor_config.php | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
-index 66e05a3..d11a9d4 100644
---- a/libraries/PDF.class.php
-+++ b/libraries/PDF.class.php
-@@ -9,7 +9,7 @@
-     exit;
- }
- 
--require_once './libraries/tcpdf/tcpdf.php';
-+require_once TCPDF_INC;
- 
- /**
-  * PDF font to use.
-diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
-index 0a09a99..92356f3 100644
---- a/libraries/vendor_config.php
-+++ b/libraries/vendor_config.php
-@@ -68,4 +68,9 @@
-  * eg. /usr/share/php/gettext/gettext.inc.
-  */
- define('GETTEXT_INC', './libraries/php-gettext/gettext.inc');
-+/**
-+ * Path to tcpdf.php file. Useful when you want to use system tcpdf,
-+ * eg. /usr/share/php/tcpdf/tcpdf.php.
-+ */
-+define('TCPDF_INC', './libraries/tcpdf/tcpdf.php');
- ?>
--- 
-1.8.1.6
-
-From 313d63ad8f8d53d953df22a97f435964841cddf0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Thu, 9 May 2013 18:29:28 +0200
-Subject: [PATCH] fix compat with tcpdf >= 6.0 (tested with 6.0.012)
-
----
- libraries/PDF.class.php | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
-index d11a9d4..fa4b48a 100644
---- a/libraries/PDF.class.php
-+++ b/libraries/PDF.class.php
-@@ -45,7 +45,6 @@ public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4',
-     ) {
-         parent::__construct();
-         $this->SetAuthor('phpMyAdmin ' . PMA_VERSION);
--        $this->AliasNbPages();
-         $this->AddFont('DejaVuSans', '', 'dejavusans.php');
-         $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
-         $this->SetFont(PMA_PDF_FONT, '', 14);
-@@ -73,6 +72,17 @@ function Footer()
-     }
- 
-     /**
-+     * Function to test an empty string (was in tcpdf < 6.0)
-+     *
-+     * @param string $str to test
-+     *
-+     * @return boolean
-+     */
-+    public function empty_string($str) {
-+            return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
-+    }
-+
-+    /**
-      * Function to set alias which will be expanded on page rendering.
-      *
-      * @param string $name  name of the alias
--- 
-1.8.1.6
-
 From 1675064f16399197e403563d59cf06e6f4fe216e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
 Date: Fri, 10 May 2013 09:25:54 +0200
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 8fcf9ee..29d7e35 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
-Version: 4.0.0
-Release: 3%{?dist}
+Version: 4.0.1
+Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group: Applications/Internet
@@ -148,6 +148,9 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN
 
 
 %changelog
+* Wed May 15 2013 Remi Collet <rpms@famillecollet.com> 4.0.1-1
+- update to 4.0.1
+
 * Mon May 13 2013 Remi Collet <rpms@famillecollet.com> 4.0.0-3
 - upstream fixes for tcpdf 6.0
 
-- 
cgit