]> git.pld-linux.org Git - packages/apache.git/blobdiff - apache.spec
projects / packages / apache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- from RH: clean logged strings of non-printable chars (CAN-2003-0020, BTS#754)
[packages/apache.git] / apache.spec
diff --git a/apache.spec b/apache.spec
index a952324b7727576d61eb4c4dae9bed03ebb5794f..1d26c4e93dd435ac9b42bd083e4edd6a8e6564dc 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# mod_rewrite_ldap     - enable ldap map supoort for mod_rewrite (alpha)
+# _with_rewrite_ldap   - enable ldap map support for mod_rewrite (alpha)
 # _without_ipv6                - disable IPv6 support
 #
 %include       /usr/lib/rpm/macros.perl
@@ -26,17 +26,18 @@ Summary(tr):        Lider WWW taray
 Summary(uk):   îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache
-Version:       1.3.27
-Release:       2
-License:       Apache Group 
+Version:       1.3.29
+Release:       1
+License:       Apache Group
 Group:         Networking/Daemons
-URL:           http://www.apache.org/
 Source0:       http://www.apache.org/dist/httpd/%{name}_%{version}.tar.gz
-Source1:       %{name}.init
+# Source0-md5: e97fe9bf51dc2c9c233d53f63b1347e3
+Source1:       %{name}1.init
 Source2:       %{name}.logrotate
 Source3:       %{name}-icons.tar.gz
 Source4:       %{name}.sysconfig
 Source5:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e
 Source6:       %{name}-httpd.conf
 Source8:       %{name}-mod_vhost_alias.conf
 Source9:       %{name}-mod_status.conf
@@ -63,26 +64,26 @@ Patch18:    %{name}-EAPI-missing_files.patch
 Patch19:       %{name}-PLD-nov6.patch
 Patch20:       %{name}-configdir_skip_backups.patch
 Patch21:       %{name}-apxs-quiet.patch
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+URL:           http://www.apache.org/
 BuildRequires: db3-devel
 BuildRequires: mm-devel >= 1.1.3
-%{?mod_rewrite_ldap:BuildRequires: openldap-devel}
-PreReq:                rc-scripts
+%{?_with_rewrite_ldap:BuildRequires: openldap-devel}
 PreReq:                mm
 PreReq:                perl
-Requires(pre): sh-utils
-Requires(pre): /usr/bin/getgid
+PreReq:                rc-scripts
 Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
-Requires:      mailcap
+Requires(postun):      /usr/sbin/userdel
 Requires:      /etc/mime.types
+Requires:      mailcap
 Requires:      psmisc >= 20.1
+Provides:      %{name}(EAPI) = %{version}
 Provides:      httpd
 Provides:      webserver
-Provides:      %{name}(EAPI) = %{version}
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     httpd
 Obsoletes:     webserver
 Obsoletes:     apache-extra
@@ -182,8 +183,6 @@ webbserver. Apache 
 Apache serbest daðýtýlan ve çok kullanýlan yetenekli bir web
 sunucusudur.
 
-%description -l uk
-
 %description -l zh_CN
 Apache Êǹ¦ÄÜÇ¿¾¢ÆëÈ«¡¢¸ßЧÇÒÃâ·ÑÌṩµÄ Web ·þÎñ³ÌÐò£¬ Í¬Ê±Ò²ÊÇ
 Internet ÉÏ×îÁ÷ÐеĠWeb ·þÎñ³ÌÐò¡£
@@ -664,7 +663,7 @@ wa
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%{?mod_rewrite_ldap:%patch13 -p1}
+%{?_with_rewrite_ldap:%patch13 -p1}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -675,7 +674,7 @@ wa
 %patch21 -p1
 
 %build
-OPTIM="%{rpmcflags}" \
+OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
@@ -706,10 +705,12 @@ OPTIM="%{rpmcflags}" \
 %{__make} LIBS1="-lm -lcrypt -lmm -ldl"
 
 rm -f src/modules/standard/mod_auth_db.so
-%{__make} -C src/modules/standard mod_auth_db.so LIBS_SHLIB="-ldb"
+%{__make} -C src/modules/standard mod_auth_db.so \
+       LIBS_SHLIB="-ldb"
 
 rm -f src/modules/standard/mod_rewrite.so
-%{__make} -C src/modules/standard mod_rewrite.so LIBS_SHLIB="-ldb %{?mod_rewrite_ldap:-lldap -llber}"
+%{__make} -C src/modules/standard mod_rewrite.so \
+       LIBS_SHLIB="-ldb %{?_with_rewrite_ldap:-lldap -llber}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -717,7 +718,8 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{_datadir}/errordocs \
        $RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},run/apache}
 
-%{__make} install-quiet root="$RPM_BUILD_ROOT"
+%{__make} install-quiet \
+       root="$RPM_BUILD_ROOT"
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/html/manual $RPM_BUILD_ROOT%{_datadir}
 
@@ -731,9 +733,8 @@ touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log
 install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-
-install %{SOURCE8}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
-install %{SOURCE9}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
+install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mod_proxy.conf
 
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
@@ -1226,7 +1227,9 @@ fi
 %{_datadir}/manual/configuring.html.en
 %lang(fr) %{_datadir}/manual/configuring.html.fr
 %lang(ja) %{_datadir}/manual/configuring.html.ja.jis
-%{_datadir}/manual/content-negotiation.html
+%{_datadir}/manual/content-negotiation.html.html
+%{_datadir}/manual/content-negotiation.html.en
+%lang(ja) %{_datadir}/manual/content-negotiation.html.ja.jis
 %{_datadir}/manual/custom-error.html.html
 %{_datadir}/manual/custom-error.html.en
 %lang(fr) %{_datadir}/manual/custom-error.html.fr
@@ -1295,6 +1298,7 @@ fi
 %{_datadir}/manual/mod/core.html.html
 %{_datadir}/manual/mod/core.html.en
 %lang(fr) %{_datadir}/manual/mod/core.html.fr
+%lang(ja) %{_datadir}/manual/mod/core.html.ja.jis
 %{_datadir}/manual/mod/directive-dict.html.html
 %{_datadir}/manual/mod/directive-dict.html.en
 %lang(fr) %{_datadir}/manual/mod/directive-dict.html.fr
@@ -1317,6 +1321,7 @@ fi
 %{_datadir}/manual/mod/mod_access.html.html
 %{_datadir}/manual/mod/mod_access.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_access.html.ja.jis
+%{_datadir}/manual/mod/mod_alias.html.html
 %{_datadir}/manual/mod/mod_alias.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja.jis
 %{_datadir}/manual/mod/mod_asis.html.html
@@ -1332,7 +1337,9 @@ fi
 %lang(ja) %{_datadir}/manual/mod/mod_env.html.ja.jis
 %{_datadir}/manual/mod/mod_include.html
 %{_datadir}/manual/mod/mod_log_agent.html
-%{_datadir}/manual/mod/mod_log_config.html
+%{_datadir}/manual/mod/mod_log_config.html.html
+%{_datadir}/manual/mod/mod_log_config.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_log_config.html.ja.jis
 %{_datadir}/manual/mod/mod_log_referer.html
 %{_datadir}/manual/mod/mod_mime.html.html
 %{_datadir}/manual/mod/mod_mime.html.en
@@ -1429,7 +1436,7 @@ fi
 %lang(ru) %{_datadir}/html/index.html.ru.ucs4
 %lang(ru) %{_datadir}/html/index.html.ru.utf8
 %lang(sv) %{_datadir}/html/index.html.se
-%lang(zh_TW) %{_datadir}/html/index.html.zh
+%lang(zh_TW) %{_datadir}/html/index.html.zh-tw.big5
 
 %{_datadir}/html/*.gif
 %{_datadir}/errordocs
@@ -1467,6 +1474,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_auth.so
 %attr(755,root,root) %{_bindir}/htpasswd
 %{_datadir}/manual/howto/auth.html
+%{_datadir}/manual/mod/mod_auth.html.html
 %{_datadir}/manual/mod/mod_auth.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja.jis
 
@@ -1542,7 +1550,9 @@ fi
 %files mod_rewrite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_rewrite.so
-%{_datadir}/manual/mod/mod_rewrite.html
+%{_datadir}/manual/mod/mod_rewrite.html.html
+%{_datadir}/manual/mod/mod_rewrite.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_rewrite.html.ja.jis
 %{_datadir}/manual/images/mod_rewrite*
 
 %files mod_status
The most widely used Web server on the Internet
This page took 0.045264 seconds and 4 git commands to generate.