summaryrefslogtreecommitdiffstats
path: root/php-doctrine-orm.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-05-30 17:44:59 +0200
committerRemi Collet <fedora@famillecollet.com>2014-05-30 17:44:59 +0200
commit2ae8e4de88eaba5bc4790a393e507d7cca33a039 (patch)
tree2c79f2e22367a75d0c42caf13540e91bdf80c7ce /php-doctrine-orm.spec
parent8d8522b76676cfd67962cdd919d9f85240c35a90 (diff)
php-doctrine-orm: fix for latest PHP
Diffstat (limited to 'php-doctrine-orm.spec')
-rw-r--r--php-doctrine-orm.spec14
1 files changed, 13 insertions, 1 deletions
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec
index ccac8bc..c7c40cf 100644
--- a/php-doctrine-orm.spec
+++ b/php-doctrine-orm.spec
@@ -18,7 +18,7 @@
Name: php-%{github_owner}-orm
Version: %{github_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Doctrine Object-Relational-Mapper (ORM)
Group: Development/Libraries
@@ -30,6 +30,9 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_co
# 2) Auto-load using Doctrine\Common\ClassLoader
Patch0: %{name}-bin.patch
+# Upstream fix for latest PHP
+Patch1: %{name}-upstream.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -79,9 +82,15 @@ Optional caches (see Doctrine\ORM\Tools\Setup::createConfiguration()):
# Patch bin script
%patch0 -p1
+# For PHP 5.5.13+
+%patch1 -p1
+
# Remove empty file
rm -f lib/Doctrine/ORM/README.markdown
+# Clenup backup files
+find . -name \*.orig -exec rm {} \;
+
# Remove unnecessary executable bit
chmod a-x lib/Doctrine/ORM/Tools/Pagination/Paginator.php
@@ -116,6 +125,9 @@ rm -rf %{buildroot}
%changelog
+* Fri May 30 2014 Remi Collet <remi@fedoraproject.org> 2.4.2-2
+- upstream fix for latest PHP (#1103219)
+
* Mon Feb 17 2014 Remi Collet <rpms@famillecollet.com> 2.4.2-1
- backport 2.4.2 for remi repo