From 383511d70528a6a670b73bd8e38d2c6ed9329e47 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 27 Mar 2018 14:09:41 +0200
Subject: update to 6.0.4 add patch to fix lang_path with RPM layout

---
 php-phpmailer6.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'php-phpmailer6.spec')

diff --git a/php-phpmailer6.spec b/php-phpmailer6.spec
index 8b414b4..b9548d6 100644
--- a/php-phpmailer6.spec
+++ b/php-phpmailer6.spec
@@ -7,7 +7,7 @@
 # Please preserve changelog entries
 #
 # Github
-%global gh_commit    44d49bab5ab1fef721d3ee07e75dc0865ddf4cc6
+%global gh_commit    3050a4ae75dfe23cd8d24080bad654619d01c696
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     PHPMailer
 %global gh_project   PHPMailer
@@ -23,11 +23,10 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_project}%{major}
-Version:        6.0.3
+Version:        6.0.4
 Release:        1%{?dist}
 Summary:        Full-featured email creation and transfer class for PHP
 
-Group:          Development/Libraries
 License:        LGPLv2+
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to get upstream test suite
@@ -36,6 +35,9 @@ Source1:        makesrc.sh
 # Simple unit test for packaging
 Source2:        PHPMailerRpmTest.php
 
+# Fix path to match RPM installation layout
+Patch0:         %{name}-layout.patch
+
 BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.5
@@ -121,6 +123,8 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
+
 cp %{SOURCE2} test/PHPMailerRpmTest.php
 
 cat << 'EOF' | tee src/autoload.php
@@ -194,6 +198,10 @@ exit $ret
 
 
 %changelog
+* Tue Mar 27 2018 Remi Collet <remi@remirepo.net> - 6.0.4-1
+- update to 6.0.4
+- add patch to fix lang_path with RPM layout
+
 * Sun Jan  7 2018 Remi Collet <remi@remirepo.net> - 6.0.3-1
 - Update to 6.0.3
 
-- 
cgit