- rel 5

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index b4c84555cb32794ea11a7c7d4a0f9b2e24c5d31e..ee3c485d1b916eeefd3ad03ddd1eee9f0633fb11 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -28,7 +28,7 @@ Summary(uk.UTF-8):    Найпопулярніший Web-Server
 Summary(zh_CN.UTF-8):  Internet 上应用最广泛的 Web 服务程序。
 Name:          apache1
 Version:       1.3.39
-Release:       1
+Release:       5
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -40,7 +40,7 @@ Source3:      apache-icons.tar.gz
 Source4:       %{name}.sysconfig
 Source5:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2
 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e
-Source6:       %{name}.monitrc
+
 Source7:       %{name}-httpd.conf
 Source8:       %{name}-common.conf
 Source9:       %{name}-mod_status.conf
@@ -111,7 +111,7 @@ URL:                http://httpd.apache.org/
 BuildRequires: bash
 BuildRequires: db-devel >= 4.1
 BuildRequires: mm-devel >= 1.3.0
-%{?with_rewrite_ldap:BuildRequires:    openldap-devel}
+%{?with_rewrite_ldap:BuildRequires:    openldap-devel >= 2.4.6}
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.4.0
 BuildRequires: rpm-perlprov
@@ -1374,7 +1374,7 @@ rm -f src/modules/standard/mod_rewrite.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{_datadir}/errordocs \
        $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
        $RPM_BUILD_ROOT%{_libexecdir} \
@@ -1387,6 +1387,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1
 sed -e 's,/usr/lib,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+mv $RPM_BUILD_ROOT%{_mandir}/hu/man8/{httpd,apache}.8
+mv $RPM_BUILD_ROOT%{_mandir}/pl/man8/{httpd,apache}.8
 
 touch $RPM_BUILD_ROOT/var/log/apache/{access,error,agent,referer}_log
 
@@ -1440,8 +1442,6 @@ install %{SOURCE13} $CFG/77_mod_info.conf
 install %{SOURCE24}    $CFG/80_errordocs.conf
 install %{SOURCE17}    $CFG/80_mod_alias.conf
 
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/apache.monitrc
-
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 
 mv $RPM_BUILD_ROOT%{_sbindir}/apxs $RPM_BUILD_ROOT%{apxs}
@@ -1573,12 +1573,6 @@ sed -i -e '
 ' /etc/apache/apache.conf
 fi
 
-# rename monitrc to be service name like other files
-if [ -f /etc/monit/apache1.monitrc.rpmsave ]; then
-       mv -f /etc/monit/apache.monitrc{,.rpmnew}
-       mv -f /etc/monit/{apache1.monitrc.rpmsave,apache.monitrc}
-fi
-
 %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2
 sed -i -e '/^\(Add\|Load\)Module.*mod_auth_dbm\.\(so\|c\)/d' /etc/apache/apache.conf
 
@@ -1882,7 +1876,6 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apache
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 %dir %{_libexecdir}
 %if %{with lingerd}
 %attr(755,root,root) %{_libexecdir}/lingerd
@@ -1892,6 +1885,8 @@ fi
 %attr(755,root,root) %{_sbindir}/apache
 %dir %attr(1773,root,http) /var/run/apache
 %{_mandir}/man8/apache.8*
+%lang(hu) %{_mandir}/hu/man8/apache.8*
+%lang(pl) %{_mandir}/pl/man8/apache.8*
 %attr(2751,root,logs) %dir /var/log/apache
 %attr(2750,root,logs) %dir /var/log/archive/apache
 %attr(640,root,logs) %ghost /var/log/apache/*
@@ -1907,18 +1902,17 @@ fi
 
 %files tools
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/htdigest
 %attr(755,root,root) %{_sbindir}/ab
 %attr(755,root,root) %{_sbindir}/apachectl
-%attr(755,root,root) %{_bindir}/htdigest
 %attr(755,root,root) %{_sbindir}/logresolve
 %attr(755,root,root) %{_sbindir}/rotatelogs
+%lang(ko) %{_mandir}/ko/man8/ab.8*
 %{_mandir}/man1/htdigest.1*
 %{_mandir}/man8/ab*
 %{_mandir}/man8/apachectl*
-%{_mandir}/man8/[l-z]*
-%lang(hu) %{_mandir}/hu/man8/*
-%lang(ko) %{_mandir}/ko/man8/*
-%lang(pl) %{_mandir}/pl/man8/*
+%{_mandir}/man8/logresolve.8*
+%{_mandir}/man8/rotatelogs.8*
 
 %files index
 %defattr(644,root,root,755)
@@ -2231,6 +2225,7 @@ fi
 %files suexec
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_sbindir}/suexec
+%{_mandir}/man8/suexec.8*
 
 %files devel
 %defattr(644,root,root,755)