summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-04-21 16:11:51 +0200
committerRemi Collet <remi@remirepo.net>2017-04-21 16:11:51 +0200
commit5bd517770050e8d3872f1d7223b85273f2aed736 (patch)
tree639f534556cc113fa1be0fc85ac4288f17130fbf
parent07d40e8ef46bcf534801143d7f5b2b532ce59be1 (diff)
v5.4.7
-rw-r--r--.gitignore7
-rw-r--r--php-swiftmailer.spec36
2 files changed, 17 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-swiftmailer.spec b/php-swiftmailer.spec
index 1e026b0..75f33ba 100644
--- a/php-swiftmailer.spec
+++ b/php-swiftmailer.spec
@@ -6,7 +6,7 @@
#
# Please preserve changelog entries
#
-%global gh_commit 81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e
+%global gh_commit 56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner swiftmailer
%global gh_project swiftmailer
@@ -14,7 +14,7 @@
%global php_home %{_datadir}/php
Name: php-%{gh_project}
-Version: 5.4.6
+Version: 5.4.7
Release: 1%{?dist}
Summary: Free Feature-rich PHP Mailer
@@ -23,7 +23,6 @@ License: MIT
URL: http://www.swiftmailer.org/
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
BuildRequires: php-composer(phpunit/phpunit)
@@ -86,8 +85,6 @@ rm lib/swiftmailer_generate_mimes_config.php
%install
-rm -rf %{buildroot}
-
mkdir -p %{buildroot}/%{php_home}/Swift
cp -p lib/*.php %{buildroot}/%{php_home}/Swift/
cp -pr lib/classes/* %{buildroot}/%{php_home}/Swift/
@@ -113,33 +110,17 @@ EOF
: Run upstream test suite
ret=0
-# remirepo:10
-run=0
-if which php56; then
- php56 %{_bindir}/phpunit --exclude smoke --verbose || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit --exclude smoke --verbose || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --exclude smoke --verbose || ret=1
-# remirepo:1
-fi
-
-# Cleanup
+for cmd in php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit --exclude smoke --verbose || ret=1
+ fi
+done
rm -r $TMPDIR
exit $ret
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc CHANGES README
@@ -149,6 +130,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Apr 21 2017 Remi Collet <remi@remirepo.net> - 5.4.7-1
+- Update to 5.4.7
+
* Mon Feb 13 2017 Remi Collet <remi@fedoraproject.org> - 5.4.6-1
- update to 5.4.6