summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-12-18 11:51:43 +0100
committerRemi Collet <remi@remirepo.net>2019-12-18 11:51:43 +0100
commitc8fcf63bdfeb6a3b6baf4400ba1ebfd9c7416595 (patch)
treeeb472c9e58d0dc6dcb0ee2d450bf749d55bf8602
parent76bbe78ce30ddaca27644c641b114d6ae3e4bde1 (diff)
- update to 1.5.4
- drop patch merged upstream
-rw-r--r--php-simplepie.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/php-simplepie.spec b/php-simplepie.spec
index b1c34f6..cdf719c 100644
--- a/php-simplepie.spec
+++ b/php-simplepie.spec
@@ -7,11 +7,11 @@
#
# Please preserve changelog entries
#
-%global gh_commit 173663382a9346acd53df60c7ffb20689c9cf1f6
+%global gh_commit 20b30e4bbbed7fd2a6ffbab48e3a2e0f96087b6a
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner simplepie
%global gh_project simplepie
-%global gh_version 1.5.3
+%global gh_version 1.5.4
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_project}
@@ -30,8 +30,6 @@ Source1: %{name}-makesrc.sh
# Adapt autoloader for installation tree
Patch0: %{name}-rpm.patch
-# PHP 7.4
-Patch1: https://patch-diff.githubusercontent.com/raw/simplepie/simplepie/pull/628.patch
BuildArch: noarch
%if %{with_tests}
@@ -91,7 +89,6 @@ Autoloader: %{_datadir}/php/%{name}/autoloader.php
%setup -qn %{gh_project}-%{gh_commit}
%patch0 -p1 -b .rpm
-%patch1 -p1
# fix rpmlint warnings
find . -type f -exec chmod -x {} \;
@@ -137,6 +134,10 @@ exit $ret
%changelog
+* Wed Dec 18 2019 Remi Collet <remi@remirepo.net> - 1.5.4-1
+- update to 1.5.4
+- drop patch merged upstream
+
* Wed Oct 9 2019 Remi Collet <remi@remirepo.net> - 1.5.3-1
- update to 1.5.3
- add patch for PHP 7.4 from