Author: glen Date: Wed Dec 21 14:57:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - resolve conflicting dirs with apache1 - cleanups
---- Files affected: SPECS: apache.spec (1.446 -> 1.447) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.446 SPECS/apache.spec:1.447 --- SPECS/apache.spec:1.446 Tue Dec 20 00:03:08 2005 +++ SPECS/apache.spec Wed Dec 21 15:57:48 2005 @@ -5,8 +5,6 @@ # - --with-suexec-uidmin=500 or =1000 ? # - subpackages for MPMs # - !!!check if all modules (*.so) are exactly the same for different MPMs -# - /var/run/apache is also owned by apache1.spec, so rename it to /var/run/httpd spec here -# (NOTE: if you fix this also adjust apache-mod_fastcgi.spec) # - check those autn modules inner deps # - for external packages: don't use any apache module name in dep as they # differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags? @@ -39,7 +37,7 @@ Summary(tr): Lider WWW tarayýcý Name: apache Version: 2.2.0 -Release: 0.86 +Release: 0.89 License: Apache Group License Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -1752,7 +1750,7 @@ cd ../.. CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1" -for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} prefork worker %{?with_event:event}; do +for mpm in prefork worker %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} %{?with_event:event}; do install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}" ../%configure \ --prefix=%{_sysconfdir} \ @@ -1849,7 +1847,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \ - $RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache,lock/mod_dav} \ + $RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/httpd,lock/mod_dav} \ $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \ $RPM_BUILD_ROOT%{_datadir}/cgi-bin @@ -1874,16 +1872,12 @@ ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd ln -s %{_libdir}/apache $RPM_BUILD_ROOT%{_sysconfdir}/modules -ln -s %{_localstatedir}/run/apache $RPM_BUILD_ROOT%{_sysconfdir}/run +ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs -#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf ln -s conf.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf -#mv $RPM_BUILD_ROOT{%{_sysconfdir},%{_libexecdir}}/build -#ln -s %{_libdir}/apache/build $RPM_BUILD_ROOT%{_sysconfdir}/build - install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd -install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache +install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit/httpd.monitrc @@ -2252,10 +2246,9 @@ %attr(755,root,root) %{_sbindir}/checkgid %attr(755,root,root) %{_sbindir}/httpd %attr(755,root,root) %{_sbindir}/httpd.* -# TODO: move to -tools -%dir %attr(770,root,http) /var/run/apache -%dir %attr(770,root,http) /var/cache/apache +%dir %attr(770,root,http) /var/run/httpd +%dir %attr(770,root,http) /var/cache/httpd %{_mandir}/man8/httpd.8* @@ -2676,6 +2669,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.447 2005/12/21 14:57:48 glen +- resolve conflicting dirs with apache1 +- cleanups + Revision 1.446 2005/12/19 23:03:08 glen - updated TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.446&r2=1.447&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
