X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache.spec;h=a6b31768213acc268a8ad6df5e7f6a961450ef65;hp=05c15cbeb900c488b4edb4c026091a66c0453d26;hb=af4f8313df3d4f53c3ae5294c8aa7f673b6b7268;hpb=d6bfc52b46405313f9cd0e009bad54b0536e91b0

diff --git a/apache.spec b/apache.spec
index 05c15cb..a6b3176 100644
--- a/apache.spec
+++ b/apache.spec
@@ -23,7 +23,7 @@
 %bcond_with	bucketeer	# debug one
 
 # this is internal macro, don't change to %%apache_modules_api
-%define		_apache_modules_api 20051115
+%define		_apache_modules_api 20120211
 
 %define		openssl_ver	0.9.8i
 %define		apr_ver		1:1.4.5
@@ -89,7 +89,6 @@ Patch14:	httpd-2.0.48-corelimit.patch
 Patch15:	httpd-2.0.48-debuglog.patch
 Patch18:	%{name}-v6only-ENOPROTOOPT.patch
 Patch19:	%{name}-conffile-path.patch
-Patch20:	%{name}-apxs.patch
 Patch23:	%{name}-suexec_fcgi.patch
 Patch24:	%{name}-bug-48094.patch
 # http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
@@ -1779,16 +1778,16 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch15 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
+# seems already applied
+#%%patch25 -p1
 %patch26 -p1
-%patch28 -p1
+%{?with_itk:%patch28 -p1}
 %patch29 -p1
 
 # using system apr, apr-util and pcre
-%{__rm} -r srclib/{apr,apr-util,pcre}
+#%%{__rm} -r srclib/{apr,apr-util,pcre}
 
 # sanity check
 MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h`