[php] drop merged patch
Remi Collet
remi at fedoraproject.org
Thu Jul 31 06:06:08 UTC 2014
commit bd310bf389877980350a331a4216e1e63bfbeaed
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Jul 31 07:20:56 2014 +0200
drop merged patch
.gitignore | 2 +-
php-man.patch | 26 --------------------------
php-syslog.patch | 30 ------------------------------
php.spec | 4 ----
4 files changed, 1 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c204a8..bb6fde2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
clog
-php.spec~
php-5.3.*.bz2
php-5.4.*.bz2
+php-5.5.*.xz
/php-5.5.0beta1.tar.xz
/php-5.5.0beta2.tar.xz
/php-5.5.0beta3.tar.xz
diff --git a/php.spec b/php.spec
index 64e080c..23ea0af 100644
--- a/php.spec
+++ b/php.spec
@@ -123,8 +123,6 @@ Patch47: php-5.4.9-phpinfo.patch
Patch48: php-5.6.0-mock.patch
# Upstream fixes (100+)
-Patch100: php-man.patch
-Patch101: php-syslog.patch
# Security fixes (200+)
@@ -747,8 +745,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch48 -p1 -b .mock
# upstream patches
-%patch100 -p1 -b .manpath
-%patch101 -p1 -b .syslog
# security patches
More information about the scm-commits
mailing list