- remove unused patches

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 3942311671f6cb720b99ed2666458c17413eb2e5..f4441f735088b4e797aa8a1be403210ca929dc01 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -170,7 +170,6 @@ Source13:   dep-tests.sh
 Source14:      skip-tests.sh
 Patch0:                %{orgname}-shared.patch
 Patch1:                %{orgname}-tld.patch
-Patch2:                %{orgname}-mail.patch
 Patch3:                %{orgname}-link-libs.patch
 Patch4:                php-bug-71475.patch
 Patch5:                %{orgname}-filter-shared.patch
@@ -202,8 +201,6 @@ Patch41:    %{orgname}-fpm-config.patch
 Patch42:       %{orgname}-fpm-shared.patch
 Patch43:       %{orgname}-silent-session-cleanup.patch
 Patch44:       %{orgname}-include_path.patch
-Patch45:       %{orgname}-imap-annotations.patch
-Patch46:       %{orgname}-imap-myrights.patch
 Patch47:       suhosin.patch
 Patch50:       extension-shared-optional-dep.patch
 Patch51:       spl-shared.patch
@@ -1996,7 +1993,6 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 cp -p php.ini-production php.ini
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -2030,8 +2026,6 @@ cp -p php.ini-production php.ini
 %endif
 %patch43 -p1
 %patch44 -p1
-#%patch45 -p1 # imap annotations. fixme
-#%patch46 -p1 # imap myrights. fixme
 %if %{with suhosin}
 %patch47 -p1
 %endif
@@ -3018,9 +3012,7 @@ fi
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-%if %{with apache2}
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
-%endif
 %dir %{php_extensiondir}
 
 %doc ext/session/mod_files.sh
@@ -3032,11 +3024,7 @@ fi
 %attr(755,root,root) %{_bindir}/php-config%{php_suffix}
 %ghost %{_bindir}/phpize
 %ghost %{_bindir}/php-config
-%if %{with apache2}
 %attr(755,root,root) %{_libdir}/libphp_common.so
-%else
-%attr(755,root,root) %{_libdir}/libphp_common.a
-%endif
 %{_libdir}/libphp_common.la
 %{_includedir}/php/php%{php_suffix}
 %{_libdir}/%{name}/build