From ba580972cc0cb69a7b1235d47d798e4a24690a87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Wed, 22 Feb 2012 17:03:31 +0100 Subject: [PATCH] - make it %install correctly - cleanup patches --- apache.spec | 103 ++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 60 deletions(-) diff --git a/apache.spec b/apache.spec index 2b0d916..55b3b91 100644 --- a/apache.spec +++ b/apache.spec @@ -77,25 +77,19 @@ Patch1: %{name}-layout.patch Patch2: %{name}-suexec.patch Patch3: %{name}-branding.patch Patch4: %{name}-apr.patch -# what about this? it isn't applied... -Patch6: httpd-2.0.40-xfsz.patch -Patch7: %{name}-syslibs.patch -Patch8: httpd-2.0.45-encode.patch -Patch9: %{name}-paths.patch -Patch10: httpd-2.0.46-dav401dest.patch -Patch12: httpd-2.0.46-sslmutex.patch -Patch14: httpd-2.0.48-corelimit.patch -Patch15: httpd-2.0.48-debuglog.patch -Patch18: %{name}-v6only-ENOPROTOOPT.patch -Patch19: %{name}-conffile-path.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 -Patch25: httpd-2.2.x-mod_ssl-sessioncaching.patch -Patch26: apache-mod_vhost_alias_docroot.patch +Patch5: %{name}-syslibs.patch +Patch6: httpd-2.0.45-encode.patch +Patch7: %{name}-paths.patch +Patch8: httpd-2.0.46-dav401dest.patch +Patch9: httpd-2.0.48-corelimit.patch +Patch10: httpd-2.0.48-debuglog.patch +Patch11: %{name}-v6only-ENOPROTOOPT.patch +Patch12: %{name}-conffile-path.patch +Patch13: %{name}-suexec_fcgi.patch +Patch14: apache-mod_vhost_alias_docroot.patch # http://mpm-itk.sesse.net/ -Patch28: apache-mpm-itk.patch -Patch29: libtool-tag.patch +Patch15: apache-mpm-itk.patch +Patch16: libtool-tag.patch URL: http://httpd.apache.org/ BuildRequires: apr-devel >= %{apr_ver} BuildRequires: apr-util-devel >= 1:1.3.10-2 @@ -1768,23 +1762,18 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 -#%%patch12 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch18 -p1 -%patch19 -p1 -%patch23 -p1 -# breaks worker build -#%%patch24 -p1 -# seems already applied -#%%patch25 -p1 -%patch26 -p1 -%{?with_itk:%patch28 -p1} -%patch29 -p1 +%{?with_itk:%patch15 -p1} +%patch16 -p1 # using system apr, apr-util and pcre #%%{__rm} -r srclib/{apr,apr-util,pcre} @@ -1879,6 +1868,7 @@ CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1" --with-program-name=httpd \ --with-mpm=prefork \ --enable-mpms-shared=all \ + --enable-nonportable-atomics=yes \ --with-suexec-bin=%{_sbindir}/suexec \ --with-suexec-caller=http \ --with-suexec-docroot=%{_datadir} \ @@ -1891,7 +1881,6 @@ CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1" --with-pcre %{__make} -./httpd -l > modules-inside %install rm -rf $RPM_BUILD_ROOT @@ -1902,7 +1891,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT/usr/lib/tmpfiles.d # prefork is default one -%{__make} install \ +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules @@ -2018,10 +2007,6 @@ s/^.*\.\(pt-br\)/%%lang(pt_BR) &/ ' >> "$cur/manual.files" cd $cur -# htpasswd goes to %{_bindir} -mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir} -ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir} - # cgi_test: create config file with ScriptAlias cat << 'EOF' > $CFG/09_cgi_test.conf ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv @@ -2036,7 +2021,6 @@ ln -sf suexec $RPM_BUILD_ROOT%{_sbindir}/suexec.fcgi %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/*.exp %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types -%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.prefork.conf %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/{extra,original} %clean @@ -2327,7 +2311,6 @@ fi %attr(755,root,root) %{_sbindir}/checkgid %attr(755,root,root) %{_sbindir}/httpd -%attr(755,root,root) %{_sbindir}/httpd.* %dir %attr(770,root,http) /var/run/httpd %dir %attr(770,root,http) /var/cache/httpd @@ -2359,6 +2342,7 @@ fi %files suexec %defattr(644,root,root,755) +%attr(4755,root,root) %{_sbindir}/fcgistarter %attr(4755,root,root) %{_sbindir}/suexec %attr(755,root,root) %{_sbindir}/suexec.fcgi %attr(755,root,root) %{_libexecdir}/mod_suexec.so @@ -2371,10 +2355,10 @@ fi %files tools %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/ab +%attr(755,root,root) %{_bindir}/ab %attr(755,root,root) %{_sbindir}/apachectl -%attr(755,root,root) %{_sbindir}/htdigest -%attr(755,root,root) %{_sbindir}/logresolve +%attr(755,root,root) %{_bindir}/htdigest +%attr(755,root,root) %{_bindir}/logresolve %attr(755,root,root) %{_sbindir}/rotatelogs %{_mandir}/man1/ab.1* %{_mandir}/man8/apachectl.8* @@ -2384,7 +2368,7 @@ fi %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/apxs +%attr(755,root,root) %{_bindir}/apxs %attr(755,root,root) %{_sbindir}/envvars* %dir %{_libexecdir} %dir %{_libexecdir}/build @@ -2425,10 +2409,10 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_auth_digest.conf %attr(755,root,root) %{_libexecdir}/mod_auth_digest.so -%files mod_authn_alias -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_alias.conf -%attr(755,root,root) %{_libexecdir}/mod_authn_alias.so +#%files mod_authn_alias +#%defattr(644,root,root,755) +#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_alias.conf +#%attr(755,root,root) %{_libexecdir}/mod_authn_alias.so %files mod_authn_anon %defattr(644,root,root,755) @@ -2445,10 +2429,10 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_dbm.conf %attr(755,root,root) %{_libexecdir}/mod_authn_dbm.so -%files mod_authn_default -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_default.conf -%attr(755,root,root) %{_libexecdir}/mod_authn_default.so +#%files mod_authn_default +#%defattr(644,root,root,755) +#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authn_default.conf +#%attr(755,root,root) %{_libexecdir}/mod_authn_default.so %files mod_authn_file %defattr(644,root,root,755) @@ -2467,10 +2451,10 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_dbm.conf %attr(755,root,root) %{_libexecdir}/mod_authz_dbm.so -%files mod_authz_default -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_default.conf -%attr(755,root,root) %{_libexecdir}/mod_authz_default.so +#%files mod_authz_default +#%defattr(644,root,root,755) +#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_authz_default.conf +#%attr(755,root,root) %{_libexecdir}/mod_authz_default.so %files mod_authz_groupfile %defattr(644,root,root,755) @@ -2509,8 +2493,8 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cache.conf %attr(755,root,root) %{_sbindir}/htcacheclean %attr(755,root,root) %{_libexecdir}/mod_cache.so -%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so -%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so +#%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so +#%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so %{_mandir}/man8/htcacheclean.8* %files mod_case_filter @@ -2674,7 +2658,7 @@ fi %files mod_rewrite %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/httxt2dbm +%attr(755,root,root) %{_bindir}/httxt2dbm %attr(755,root,root) %{_libexecdir}/mod_rewrite.so %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_rewrite.conf %{_mandir}/man1/httxt2dbm.1* @@ -2736,13 +2720,12 @@ fi %files -n htpasswd-%{name} %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/htpasswd -%attr(755,root,root) %{_sbindir}/htpasswd %{_mandir}/man1/htpasswd.1* %files dbmtools %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/dbmmanage -%attr(755,root,root) %{_sbindir}/htdbm +%attr(755,root,root) %{_bindir}/dbmmanage +%attr(755,root,root) %{_bindir}/htdbm %{_mandir}/man1/dbmmanage.1* %{_mandir}/man1/htdbm.1* -- 2.46.0