X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1.spec;h=5cf3628a8a1e846d499c15f1efb51576228d54fc;hb=ff3bbc97a7711cee181afd890ddcf15f89fb4a3d;hp=029e0bc6a4d01a3ef3506351baf64f8897158827;hpb=8caf5449c9db546868e074ab88f05132029202be;p=packages%2Fapache1.git diff --git a/apache1.spec b/apache1.spec index 029e0bc..5cf3628 100644 --- a/apache1.spec +++ b/apache1.spec @@ -1,7 +1,7 @@ # # Conditional build: -# _with_rewrite_ldap - enable ldap map support for mod_rewrite (alpha) -# _without_ipv6 - disable IPv6 support +%bcond_with rewrite_ldap # enable ldap map support for mod_rewrite (alpha) +%bcond_without ipv6 # disable IPv6 support # %include /usr/lib/rpm/macros.perl Summary: The most widely used Web server on the Internet @@ -14,7 +14,7 @@ Summary(id): Web server yang paling banyak digunakan di Internet Summary(is): Vinsælasti vefþjónninn á Netinu Summary(it): Il web server più diffuso su Internet Summary(ja): ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤ÇºÇ¤â°ìÈÌŪ¤Ë»ÈÍѤµ¤ì¤Æ¤¤¤ë Web ¥µ¡¼¥Ð¡¼ -Summary(no): Den mest utbredte web-tjeneren på Internett +Summary(nb): Den mest utbredte web-tjeneren på Internett Summary(pl): Serwer WWW (World Wide Web) Summary(pt): O servidor Web mais largamente utilizado em toda a Internet Summary(pt_BR): Servidor HTTPD para prover serviços WWW @@ -26,16 +26,16 @@ Summary(tr): Lider WWW taray Summary(uk): îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server Summary(zh_CN): Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£ Name: apache1 -Version: 1.3.27 -Release: 6 +Version: 1.3.29 +Release: 5 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz -# Source0-md5: 65b89365a65dcad71d4402b4862beeaa +# Source0-md5: e97fe9bf51dc2c9c233d53f63b1347e3 Source1: %{name}.init Source2: %{name}.logrotate Source3: apache-icons.tar.gz -# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83 +# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83 Source4: %{name}.sysconfig Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e @@ -66,13 +66,13 @@ Patch19: %{name}-PLD-nov6.patch Patch20: %{name}-configdir_skip_backups.patch Patch21: %{name}-apxs-quiet.patch Patch22: %{name}-db4.patch -Patch23: %{name}-security_htdigest_bufferoverflow.patch +Patch23: %{name}-CAN-2003-0020.patch URL: http://www.apache.org/ BuildRequires: db-devel >= 4.1 BuildRequires: mm-devel >= 1.3.0 -%{?_with_rewrite_ldap:BuildRequires: openldap-devel} +%{?with_rewrite_ldap:BuildRequires: openldap-devel} PreReq: mm -PreReq: perl +PreReq: perl-base PreReq: rc-scripts Requires(pre): /bin/id Requires(pre): /usr/bin/getent @@ -85,27 +85,27 @@ Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel Requires: /etc/mime.types +Requires: mailcap +Requires: psmisc >= 20.1 +Requires: %{name}-apxs = %{version} Provides: %{name}(EAPI) = %{version} Provides: apache(EAPI) = %{version} Provides: apache = %{version}-%{release} Provides: httpd -Requires: mailcap -Requires: psmisc >= 20.1 Provides: webserver BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -Obsoletes: apache <= 1.3.27-3 +Obsoletes: apache < 2.0.0 Obsoletes: apache-extra Obsoletes: apache6 Obsoletes: apache-doc -Obsoletes: httpd Obsoletes: indexhtml Obsoletes: webserver -%define _sysconfdir /etc/httpd -%define _includedir %{_prefix}/include/apache -%define _libexecdir %{_prefix}/lib/apache -%define apxs /usr/sbin/apxs -%define httpdir /home/services/httpd +%define _sysconfdir /etc/apache +%define _includedir %{_prefix}/include/apache1 +%define _libexecdir %{_prefix}/lib/apache1 +%define apxs /usr/sbin/apxs1 +%define httpdir /home/services/apache %define _datadir %{httpdir} %define webappsdir %{httpdir}/apps @@ -158,7 +158,7 @@ Apache ¤Ç¤¹¡£¤Þ¤¿¡¢apache ¤Ï¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤ÇºÇ¤â°ìÈÌŪ¤Ë»ÈÍÑ ¤µ¤ì¤Æ¤¤¤ë Web ¥µ¡¼¥Ð¡¼¤Ç¤¹¡£ -%description -l no +%description -l nb Apache er en kraftig, funksjonsrik, effektiv og fritt tilgjengelig web-tjener. Apache er også den mest populære web-tjeneren på Internet. @@ -209,7 +209,7 @@ Summary(uk): Apache suEXEC CGI wrapper Group: Development/Tools Requires: %{name}(EAPI) = %{version} Provides: apache-suexec = %{version}-%{release} -Obsoletes: apache-suexec <= 1.3.27-3 +Obsoletes: apache-suexec < 2.0.0 %description suexec The suEXEC feature provides Apache users the ability to run CGI and @@ -245,6 +245,40 @@ wykonywane jako taki sam u ÓÉÓÔÅÍÎϧ ÂÅÚÐÅËÉ, ËÏÔÒ¦ ÐÏÒÏÄÖÅΦ ×ÉËÏÒÉÓÔÁÎÎÑÍ ÔÁËÉÈ ÐÒÏÇÒÁÍ, ÎÁÓÔ¦ÊÌÉ×Ï ÒÁÄÉÍÏ ÎÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÃØÏÇÏ ÐÁËÅÔÕ... +%package apxs +Summary: APache eXtenSion tool +Summary(pl): Narzêdzie do rozszerzania Apache'a +Group: Development/Tools + +%description apxs +APache eXtenSion tool. + +%description apxs -l pl +Narzêdzie do rozszerzania Apache'a. + +%package tools +Summary: Apache tools +Summary(pl): Narzêdzia Apache'a +Group: Development/Tools + +%description tools +Apache tools. + +%description tools -l pl +Narzêdzia Apache'a. + +%package index +Summary: Apache index.html* files +Summary(pl): Pliki Apache index.html* +Group: Documentation +Requires: %{name} = %{version} + +%description index +Apache index.html* files. + +%description index -l pl +Pliki Apache index.html*. + %package devel Summary: Module development tools for the Apache web server Summary(cs): Hlavièkové soubory pro Apache Web server @@ -256,7 +290,7 @@ Summary(id): File header untuk Apache Web server Summary(is): Hausaskrár með Apache vefþjóninum Summary(it): File include per il web server Apache Summary(ja): Apache Web ¥µ¡¼¥Ð¡¼ÍѤγ«È¯¥Ä¡¼¥ë -Summary(no): Headerfiler for webtjeneren Apache +Summary(nb): Headerfiler for webtjeneren Apache Summary(pl): Pliki nag³ówkowe do tworzenai modu³ów rozszerzeñ do serwera www Apache Summary(pt): Ficheiros de inclusão para o servidor Web Apache Summary(pt_BR): Arquivos de inclusão do Apache para desenvolvimento de módulos @@ -267,11 +301,11 @@ Summary(sv): Huvudfiler f Summary(uk): úÁÓÏÂÉ ÓÔ×ÏÒÅÎÎÑ ÍÏÄÕÌ¦× ÄÌÑ web server'Õ Apache Summary(zh_CN): ÓÃÓÚ Apache Web ·þÎñ³ÌÐòµÄ¿ª·¢¹¤¾ß¡£ Group: Networking/Utilities -Requires: %{name}(EAPI) = %{version} +Requires: %{name}-apxs = %{version} Provides: %{name}(EAPI)-devel = %{version} Provides: apache(EAPI)-devel = %{version} Provides: apache-devel = %{version}-%{release} -Obsoletes: apache-devel <= 1.3.27-3 +Obsoletes: apache-devel < 2.0.0 %description devel The apache-devel package contains header files for Apache. @@ -301,7 +335,7 @@ Apache-devel pakkinn inniheldur frumk %description devel -l it Il pacchetto apache-devel contiene i file header per Apache. -%description devel -l no +%description devel -l nb Apache-devel pakken inneholder headerfiler for Apache. %description devel -l pl @@ -329,10 +363,10 @@ Paketet apache-devel inneh Summary: Apache module for run CGI whenever a file of a certain type is requested Summary(pl): Modu³ dla apache do uruchamiania skryptów cgi Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_actions = %{version}-%{release} -Obsoletes: apache-mod_actions <= 1.3.27-3 +Obsoletes: apache-mod_actions < 2.0.0 %description mod_actions This package contains mod_actions module. This module lets you run CGI @@ -347,10 +381,10 @@ Ten modu Summary: Apache module with user authentication using textual files Summary(pl): Modu³ autentykacji u¿ytkownika przy u¿yciu plików tekstowych dla Apache Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_auth = %{version}-%{release} -Obsoletes: apache-mod_auth <= 1.3.27-3 +Obsoletes: apache-mod_auth < 2.0.0 %description mod_auth This package contains mod_auth module. It provides for user @@ -364,10 +398,10 @@ u Summary: Apache module with "anonymous" user access authentication Summary(pl): Modu³ apache oferuj±cy anonimow± autoryzacjê u¿ytkownia Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_auth_anon = %{version}-%{release} -Obsoletes: apache-mod_auth_anon <= 1.3.27-3 +Obsoletes: apache-mod_auth_anon < 2.0.0 %description mod_auth_anon This package contains mod_auth_anon module. It allows "anonymous" user @@ -390,11 +424,11 @@ postaci adresu pocztowego u Summary: Apache module with user authentication which uses Berkeley DB files Summary(pl): Modu³ apache z mechanizmem autentykacji u¿ywaj±cym plików Berkeley DB Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} -Requires: %{_sbindir}/apxs +Requires: %{apxs} Provides: apache-mod_auth_db = %{version}-%{release} -Obsoletes: apache-mod_auth_db <= 1.3.27-3 +Obsoletes: apache-mod_auth_db < 2.0.0 %description mod_auth_db This package contains mod_auth_db module. It provides for user @@ -410,11 +444,11 @@ ale jako plik Summary: Apache user authentication module using MD5 Digest Authentication Summary(pl): Modu³ apache do autoryzacji MD5 Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_auth_digest = %{version}-%{release} Obsoletes: %{name}-mod_digest -Obsoletes: apache-mod_auth_digest <= 1.3.27-3 +Obsoletes: apache-mod_auth_digest < 2.0.0 %description mod_auth_digest This package contains mod_digest module. It provides user @@ -428,10 +462,10 @@ Authentication. Summary: Apache module - authentication variables for arbitrary directives Summary(pl): Modu³ apache do definiowania zmiennych Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_define = %{version}-%{release} -Obsoletes: apache-mod_define <= 1.3.27-3 +Obsoletes: apache-mod_define < 2.0.0 %description mod_define It provides the definition variables for arbitrary directives, i.e. @@ -444,10 +478,10 @@ Modu Summary: Older version of apache user authentication module using MD5 Digest Authentication Summary(pl): Starsza wersja modu³u apache do autoryzacji MD5 Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_digest = %{version}-%{release} -Obsoletes: apache-mod_digest <= 1.3.27-3 +Obsoletes: apache-mod_digest < 2.0.0 %description mod_digest This package contains mod_digest module. It provides user @@ -468,10 +502,10 @@ wersji standardu. Summary: Apache module for "trailing slash" redirects and serving directory index files Summary(pl): Modu³ oferuj±cy przekierowania i serwowanie indeksu katalogu. Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_dir = %{version}-%{release} -Obsoletes: apache-mod_dir <= 1.3.27-3 +Obsoletes: apache-mod_dir < 2.0.0 %description mod_dir This package contains mod_dir which provides "trailing slash" @@ -484,10 +518,10 @@ Modu Summary: Apache module which generates Expires HTTP headers Summary(pl): Modu³ generuj±cy nag³ówki HTTP Expires Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_expires = %{version}-%{release} -Obsoletes: apache-mod_expires <= 1.3.27-3 +Obsoletes: apache-mod_expires < 2.0.0 %description mod_expires This module controls the setting of the Expires HTTP header in server @@ -504,10 +538,10 @@ wa Summary: Apache module allows for the customization of HTTP response headers Summary(pl): Modu³ pozwalaj±cy na modyfikacjê nag³ówków HTTP Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_headers = %{version}-%{release} -Obsoletes: apache-mod_headers <= 1.3.27-3 +Obsoletes: apache-mod_headers < 2.0.0 %description mod_headers This package contains mod_headers module. The module allows for the @@ -522,10 +556,10 @@ wysy Summary: Apache module for mmap()ing statically configured list files Summary(pl): Modu³ s³u¿±cy do mmap()owania plików. Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_mmap_static = %{version}-%{release} -Obsoletes: apache-mod_mmap_static <= 1.3.27-3 +Obsoletes: apache-mod_mmap_static < 2.0.0 %description mod_mmap_static This package contains mod_mmap_static module. It provides mmap()ing of @@ -540,10 +574,10 @@ Modu Summary: Apache module with imap-file handler Summary(pl): Modu³ z obs³ug± imap-file Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_imap = %{version}-%{release} -Obsoletes: apache-mod_imap <= 1.3.27-3 +Obsoletes: apache-mod_imap < 2.0.0 %description mod_imap This package contains mod_imap module. It provides for .map files, @@ -557,10 +591,10 @@ Modu Summary: Apache module with comprehensive overview of the server configuration Summary(pl): Modu³ dostarczaj±cy informacji na temat serwera. Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_info = %{version}-%{release} -Obsoletes: apache-mod_info <= 1.3.27-3 +Obsoletes: apache-mod_info < 2.0.0 %description mod_info This package contains mod_info module. It provides a comprehensive @@ -576,12 +610,12 @@ Summary: Apache module with Web proxy Summary(pl): Modu³ dodaj±cy obs³ugê serwera proxy Group: Networking/Daemons Requires(post,preun): %{name}(EAPI) = %{version} -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires(post,preun): grep Requires(preun): fileutils Requires: %{name}(EAPI) = %{version} Provides: apache-mod_proxy = %{version}-%{release} -Obsoletes: apache-mod_proxy <= 1.3.27-3 +Obsoletes: apache-mod_proxy < 2.0.0 %description mod_proxy This package contains module with implementation a proxy/cache for @@ -598,10 +632,10 @@ HTTP/1.0. Summary: Apache module with rule-based engine for rewrite requested URLs on the fly Summary(pl): Modu³ do ,,przepisywania'' adresów URL w locie Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_rewrite = %{version}-%{release} -Obsoletes: apache-mod_rewrite <= 1.3.27-3 +Obsoletes: apache-mod_rewrite < 2.0.0 %description mod_rewrite This package contains It provides a rule-based rewriting engine to @@ -615,12 +649,12 @@ Summary: Server status report module for apache Summary(pl): Modu³ dostarczaj±cy informacje statystyczne o serwerze. Group: Networking/Daemons Requires(post,preun): %{name}(EAPI) = %{version} -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires(post,preun): grep Requires(preun): fileutils Requires: %{name}(EAPI) = %{version} Provides: apache-mod_status = %{version}-%{release} -Obsoletes: apache-mod_status <= 1.3.27-3 +Obsoletes: apache-mod_status < 2.0.0 %description mod_status The Status module allows a server administrator to find out how well @@ -637,10 +671,10 @@ pracy serwera apache (w postaci strony HTML). Summary: Apache module which provides a magic token for each request Summary(pl): Modu³ nadaj±cy ka¿demu ¿±daniu unikalny token Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_unique_id = %{version}-%{release} -Obsoletes: apache-mod_unique_id <= 1.3.27-3 +Obsoletes: apache-mod_unique_id < 2.0.0 %description mod_unique_id This package contains the mod_unique_id. This module provides a magic @@ -661,10 +695,10 @@ UNIQUE_ID. Summary: Apache module for user tracking using cookies Summary(pl): Modu³ s³u¿±cy do ¶ledzenia u¿ytkowników przy u¿yciu ciasteczek Group: Networking/Daemons -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires: %{name}(EAPI) = %{version} Provides: apache-mod_usertrack = %{version}-%{release} -Obsoletes: apache-mod_usertrack <= 1.3.27-3 +Obsoletes: apache-mod_usertrack < 2.0.0 %description mod_usertrack This package contains the user tracking module which did its own @@ -681,12 +715,12 @@ Summary: Apache module for dynamically configured mass virtual hosting Summary(pl): Modu³ dodaj±cy obs³ugê hostów wirtualnych. Group: Networking/Daemons Requires(post,preun): %{name}(EAPI) = %{version} -Requires(post,preun): %{_sbindir}/apxs +Requires(post,preun): %{apxs} Requires(post,preun): grep Requires(preun): fileutils Requires: %{name}(EAPI) = %{version} Provides: apache-mod_vhost_alias = %{version}-%{release} -Obsoletes: apache-mod_vhost_alias <= 1.3.27-3 +Obsoletes: apache-mod_vhost_alias < 2.0.0 %description mod_vhost_alias This package contains the mod_vhost_alias. It provides support for @@ -707,24 +741,24 @@ wirtualnych. %patch6 -p0 %patch7 -p1 %patch8 -p1 -%{!?_without_ipv6:%patch9 -p1} +%{?with_ipv6:%patch9 -p1} %patch10 -p1 %patch11 -p1 %patch12 -p1 -%{?_with_rewrite_ldap:%patch13 -p1} +%{?with_rewrite_ldap:%patch13 -p1} %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 -%{?_without_ipv6:%patch19 -p1} +%{!?with_ipv6:%patch19 -p1} %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 +%patch23 -p0 %build -OPTIM="%{rpmcflags}" \ +OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \ ./configure \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ @@ -735,7 +769,7 @@ OPTIM="%{rpmcflags}" \ --manualdir=%{_datadir}/html/manual \ --localstatedir=/var \ --runtimedir=/var/run \ - --logfiledir=/var/log/httpd \ + --logfiledir=/var/log/apache \ --with-layout=PLD \ --without-confadjust \ --enable-module=all \ @@ -750,7 +784,8 @@ OPTIM="%{rpmcflags}" \ --suexec-docroot=%{_datadir} \ --disable-rule=WANTHSREGEX \ --enable-rule=EAPI \ - %{!?_without_ipv6:--enable-rule=INET6} + --target=apache \ + %{?with_ipv6:--enable-rule=INET6} %{__make} LIBS1="-lm -lcrypt -lmm -ldl" @@ -760,63 +795,68 @@ rm -f src/modules/standard/mod_auth_db.so rm -f src/modules/standard/mod_rewrite.so %{__make} -C src/modules/standard mod_rewrite.so \ - LIBS_SHLIB="-ldb %{?_with_rewrite_ldap:-lldap -llber}" + LIBS_SHLIB="-ldb %{?with_rewrite_ldap:-lldap -llber}" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT{%{_datadir}/errordocs,%{webappsdir}} \ - $RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},run/apache} + $RPM_BUILD_ROOT/var/{log/{apache,archiv/apache},run/apache} %{__make} install-quiet \ - root=$RPM_BUILD_ROOT + root="$RPM_BUILD_ROOT" mv -f $RPM_BUILD_ROOT%{_datadir}/html/manual $RPM_BUILD_ROOT%{_datadir} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache +install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1 +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apache +install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache1 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} -touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log +touch $RPM_BUILD_ROOT/var/log/apache/{access,error,agent,referer}_log install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs -install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf +install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.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 +mv $RPM_BUILD_ROOT%{_sbindir}/apxs $RPM_BUILD_ROOT%{apxs} +mv $RPM_BUILD_ROOT%{_mandir}/man8/apxs.8 $RPM_BUILD_ROOT%{_mandir}/man8/apxs1.8 + +perl -p -i -e 's/^if ...O ne "MSWin32"./if (0)/' $RPM_BUILD_ROOT%{apxs} + %clean rm -rf $RPM_BUILD_ROOT %pre if [ -n "`getgid http`" ]; then - if [ "`getgid http`" != "51" ]; then - echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2 - exit 1 - fi + if [ "`getgid http`" != "51" ]; then + echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2 + exit 1 + fi else - echo "Adding group http GID=51." - /usr/sbin/groupadd -g 51 -r -f http + echo "Adding group http GID=51." + /usr/sbin/groupadd -g 51 -r -f http fi if [ -n "`id -u http 2>/dev/null`" ]; then - if [ "`id -u http`" != "51" ]; then - echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2 - exit 1 - fi - if [ "`getent passwd http | cut -d: -f6`" = "/home/httpd" ]; then - /usr/sbin/usermod -d %{httpdir} http - fi + if [ "`id -u http`" != "51" ]; then + echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2 + exit 1 + fi + if [ "`getent passwd http | cut -d: -f6`" = "/home/httpd" ]; then + /usr/sbin/usermod -d %{httpdir} http + fi else - echo "Adding user http UID=51." - /usr/sbin/useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http 1>&2 + echo "Adding user http UID=51." + /usr/sbin/useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http 1>&2 fi %post -/sbin/chkconfig --add httpd +/sbin/chkconfig --add apache %{apxs} -e -a -n access %{_libexecdir}/mod_access.so 1>&2 %{apxs} -e -a -n alias %{_libexecdir}/mod_alias.so 1>&2 %{apxs} -e -a -n asis %{_libexecdir}/mod_asis.so 1>&2 @@ -835,11 +875,11 @@ fi %{apxs} -e -a -n speling %{_libexecdir}/mod_speling.so 1>&2 %{apxs} -e -a -n userdir %{_libexecdir}/mod_userdir.so 1>&2 umask 137 -touch /var/log/httpd/{access,error,agent,referer}_log -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +touch /var/log/apache/{access,error,agent,referer}_log +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun @@ -861,21 +901,21 @@ if [ "$1" = "0" ]; then %{apxs} -e -A -n setenvif %{_libexecdir}/mod_setenvif.so 1>&2 %{apxs} -e -A -n speling %{_libexecdir}/mod_speling.so 1>&2 %{apxs} -e -A -n userdir %{_libexecdir}/mod_userdir.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd stop 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache stop 1>&2 fi - /sbin/chkconfig --del httpd + /sbin/chkconfig --del apache fi %postun if [ "$1" = "0" ]; then - echo "Removing user http." - /usr/sbin/userdel http - echo "Removing group http." - /usr/sbin/groupdel http + echo "Removing user http." + /usr/sbin/userdel http + echo "Removing group http." + /usr/sbin/groupdel http fi -%triggerpostun -- apache <= 1.3.27-3 +%triggerpostun -- apache < 2.0.0 if [ -z "`getgid http`" ]; then echo "Adding group http GID=51." /usr/sbin/groupadd -g 51 -r -f http @@ -884,7 +924,7 @@ if [ -z "`id -u http 2>/dev/null`" ]; then echo "Adding user http UID=51." /usr/sbin/useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http 1>&2 fi -/sbin/chkconfig --add httpd +/sbin/chkconfig --add apache %{apxs} -e -a -n access %{_libexecdir}/mod_access.so 1>&2 %{apxs} -e -a -n alias %{_libexecdir}/mod_alias.so 1>&2 %{apxs} -e -a -n asis %{_libexecdir}/mod_asis.so 1>&2 @@ -905,396 +945,396 @@ fi %post mod_actions %{apxs} -e -a -n actions %{_libexecdir}/mod_actions.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_actions if [ "$1" = "0" ]; then %{apxs} -e -A -n actions %{_libexecdir}/mod_actions.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_actions -- apache-mod_actions <= 1.3.27-3 +%triggerpostun mod_actions -- apache-mod_actions < 2.0.0 %{apxs} -e -a -n actions %{_libexecdir}/mod_actions.so 1>&2 %post mod_auth %{apxs} -e -a -n auth %{_libexecdir}/mod_auth.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_auth if [ "$1" = "0" ]; then %{apxs} -e -A -n auth %{_libexecdir}/mod_auth.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_auth -- apache-mod_auth <= 1.3.27-3 +%triggerpostun mod_auth -- apache-mod_auth < 2.0.0 %{apxs} -e -a -n auth %{_libexecdir}/mod_auth.so 1>&2 %post mod_auth_anon %{apxs} -e -a -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_auth_anon if [ "$1" = "0" ]; then %{apxs} -e -A -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_auth_anon -- apache-mod_auth_anon <= 1.3.27-3 +%triggerpostun mod_auth_anon -- apache-mod_auth_anon < 2.0.0 %{apxs} -e -a -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 %post mod_auth_db %{apxs} -e -a -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_auth_db if [ "$1" = "0" ]; then %{apxs} -e -A -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2 %{apxs} -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2 -%triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.27-3 +%triggerpostun mod_auth_db -- apache-mod_auth_db < 2.0.0 %{apxs} -e -a -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 %post mod_auth_digest %{apxs} -e -a -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_auth_digest if [ "$1" = "0" ]; then %{apxs} -e -A -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_auth_digest -- apache-mod_auth_digest <= 1.3.27-3 +%triggerpostun mod_auth_digest -- apache-mod_auth_digest < 2.0.0 %{apxs} -e -a -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 %post mod_define %{apxs} -e -a -n define %{_libexecdir}/mod_define.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_define if [ "$1" = "0" ]; then %{apxs} -e -A -n define %{_libexecdir}/mod_define.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_define -- apache-mod_define <= 1.3.27-3 +%triggerpostun mod_define -- apache-mod_define < 2.0.0 %{apxs} -e -a -n define %{_libexecdir}/mod_define.so 1>&2 %post mod_digest %{apxs} -e -a -n digest %{_libexecdir}/mod_digest.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_digest if [ "$1" = "0" ]; then %{apxs} -e -A -n digest %{_libexecdir}/mod_digest.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_digest -- apache-mod_digest <= 1.3.27-3 +%triggerpostun mod_digest -- apache-mod_digest < 2.0.0 %{apxs} -e -a -n digest %{_libexecdir}/mod_digest.so 1>&2 %post mod_dir %{apxs} -e -a -n dir %{_libexecdir}/mod_dir.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_dir if [ "$1" = "0" ]; then %{apxs} -e -A -n dir %{_libexecdir}/mod_dir.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_dir -- apache-mod_dir <= 1.3.27-3 +%triggerpostun mod_dir -- apache-mod_dir < 2.0.0 %{apxs} -e -a -n dir %{_libexecdir}/mod_dir.so 1>&2 %post mod_expires %{apxs} -e -a -n expires %{_libexecdir}/mod_expires.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_expires if [ "$1" = "0" ]; then %{apxs} -e -A -n expires %{_libexecdir}/mod_expires.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_expires -- apache-mod_expires <= 1.3.27-3 +%triggerpostun mod_expires -- apache-mod_expires < 2.0.0 %{apxs} -e -a -n expires %{_libexecdir}/mod_expires.so 1>&2 %post mod_headers %{apxs} -e -a -n headers %{_libexecdir}/mod_headers.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_headers if [ "$1" = "0" ]; then %{apxs} -e -A -n headers %{_libexecdir}/mod_headers.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_headers -- apache-mod_headers <= 1.3.27-3 +%triggerpostun mod_headers -- apache-mod_headers < 2.0.0 %{apxs} -e -a -n headers %{_libexecdir}/mod_headers.so 1>&2 %post mod_mmap_static %{apxs} -e -a -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_mmap_static if [ "$1" = "0" ]; then %{apxs} -e -A -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_mmap_static -- apache-mod_mmap_static <= 1.3.27-3 +%triggerpostun mod_mmap_static -- apache-mod_mmap_static < 2.0.0 %{apxs} -e -a -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 %post mod_imap %{apxs} -e -a -n imap %{_libexecdir}/mod_imap.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_imap if [ "$1" = "0" ]; then %{apxs} -e -A -n imap %{_libexecdir}/mod_imap.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_imap -- apache-mod_imap <= 1.3.27-3 +%triggerpostun mod_imap -- apache-mod_imap < 2.0.0 %{apxs} -e -a -n imap %{_libexecdir}/mod_imap.so 1>&2 %post mod_info %{apxs} -e -a -n info %{_libexecdir}/mod_info.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_info if [ "$1" = "0" ]; then %{apxs} -e -A -n info %{_libexecdir}/mod_info.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_info -- apache-mod_info <= 1.3.27-3 +%triggerpostun mod_info -- apache-mod_info < 2.0.0 %{apxs} -e -a -n info %{_libexecdir}/mod_info.so 1>&2 %post mod_proxy %{apxs} -e -a -n proxy %{_libexecdir}/libproxy.so 1>&2 -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/mod_proxy.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_proxy.conf" /etc/apache/apache.conf; then + echo "Include /etc/apache/mod_proxy.conf" >> /etc/apache/apache.conf fi -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_proxy if [ "$1" = "0" ]; then umask 027 %{apxs} -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2 - grep -v "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + grep -v "^Include.*mod_proxy.conf" /etc/apache/apache.conf > \ + /etc/apache/apache.conf.tmp + mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_proxy -- apache-mod_proxy <= 1.3.27-3 +%triggerpostun mod_proxy -- apache-mod_proxy < 2.0.0 %{apxs} -e -a -n proxy %{_libexecdir}/libproxy.so 1>&2 -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/mod_proxy.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_proxy.conf" /etc/apache/apache.conf; then + echo "Include /etc/apache/mod_proxy.conf" >> /etc/apache/apache.conf fi %post mod_rewrite %{apxs} -e -a -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_rewrite if [ "$1" = "0" ]; then %{apxs} -e -A -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_rewrite -- apache-mod_rewrite <= 1.3.27-3 +%triggerpostun mod_rewrite -- apache-mod_rewrite < 2.0.0 %{apxs} -e -a -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 %post mod_status %{apxs} -e -a -n status %{_libexecdir}/mod_status.so 1>&2 -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_status.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/mod_status.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_status.conf" /etc/apache/apache.conf; then + echo "Include /etc/apache/mod_status.conf" >> /etc/apache/apache.conf fi -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_status if [ "$1" = "0" ]; then umask 027 %{apxs} -e -A -n status %{_libexecdir}/mod_status.so 1>&2 - grep -v "^Include.*mod_status.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + grep -v "^Include.*mod_status.conf" /etc/apache/apache.conf > \ + /etc/apache/apache.conf.tmp + mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_status -- apache-mod_status <= 1.3.27-3 +%triggerpostun mod_status -- apache-mod_status < 2.0.0 %{apxs} -e -a -n status %{_libexecdir}/mod_status.so 1>&2 -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_status.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/mod_status.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_status.conf" /etc/apache/apache.conf; then + echo "Include /etc/apache/mod_status.conf" >> /etc/apache/apache.conf fi %post mod_unique_id %{apxs} -e -a -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_unique_id if [ "$1" = "0" ]; then %{apxs} -e -A -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_unique_id -- apache-mod_unique_id <= 1.3.27-3 +%triggerpostun mod_unique_id -- apache-mod_unique_id < 2.0.0 %{apxs} -e -a -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 %post mod_usertrack %{apxs} -e -a -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_usertrack if [ "$1" = "0" ]; then %{apxs} -e -A -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_usertrack -- apache-mod_usertrack <= 1.3.27-3 +%triggerpostun mod_usertrack -- apache-mod_usertrack < 2.0.0 %{apxs} -e -a -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 %post mod_vhost_alias %{apxs} -e -a -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/mod_vhost_alias.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_vhost_alias.conf" /etc/apache/apache.conf; then + echo "Include /etc/apache/mod_vhost_alias.conf" >> /etc/apache/apache.conf fi -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon." + echo "Run \"/etc/rc.d/init.d/apache start\" to start apache http daemon." fi %preun mod_vhost_alias if [ "$1" = "0" ]; then umask 027 %{apxs} -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 - grep -v "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 + grep -v "^Include.*mod_vhost_alias.conf" /etc/apache/apache.conf > \ + /etc/apache/apache.conf.tmp + mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi fi -%triggerpostun mod_vhost_alias -- apache-mod_vhost_alias <= 1.3.27-3 +%triggerpostun mod_vhost_alias -- apache-mod_vhost_alias < 2.0.0 %{apxs} -e -a -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf; then - echo "Include /etc/httpd/mod_vhost_alias.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_vhost_alias.conf" /etc/apache/apache.conf; then + echo "Include /etc/apache/mod_vhost_alias.conf" >> /etc/apache/apache.conf fi %files @@ -1302,10 +1342,10 @@ fi %doc ABOUT_APACHE src/CHANGES README %doc conf/mime.types -%attr(754,root,root) /etc/rc.d/init.d/httpd +%attr(754,root,root) /etc/rc.d/init.d/apache %attr(750,root,root) %dir %{_sysconfdir} -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apache.conf %attr(640,root,root) %{_sysconfdir}/magic %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/* @@ -1333,24 +1373,15 @@ fi %attr(755,root,root) %{_bindir}/checkgid %attr(755,root,root) %{_bindir}/htdigest -%attr(755,root,root) %{_sbindir}/ab -%attr(755,root,root) %{_sbindir}/apachectl -%attr(755,root,root) %{_sbindir}/apxs -%attr(755,root,root) %{_sbindir}/httpd -%attr(755,root,root) %{_sbindir}/logresolve -%attr(755,root,root) %{_sbindir}/rotatelogs +%attr(755,root,root) %{_sbindir}/apache %dir %attr(1773,root,http) /var/run/apache -%{_mandir}/man1/htdigest.1* -%{_mandir}/man8/* -%lang(hu) %{_mandir}/hu/man8/* -%lang(ko) %{_mandir}/ko/man8/* -%lang(pl) %{_mandir}/pl/man8/* +%{_mandir}/man8/apache.8* -%attr(750,root,root) %dir /var/log/httpd -%attr(750,root,root) %dir /var/log/archiv/httpd -%attr(640,root,root) %ghost /var/log/httpd/* +%attr(750,root,root) %dir /var/log/apache +%attr(750,root,root) %dir /var/log/archiv/apache +%attr(640,root,root) %ghost /var/log/apache/* %dir %{_datadir} %dir %{_datadir}/manual @@ -1377,7 +1408,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 @@ -1446,6 +1479,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 @@ -1468,6 +1502,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 @@ -1483,7 +1518,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 @@ -1550,6 +1587,38 @@ fi %{_datadir}/manual/vhosts/virtual-host.html %attr(755,root,root) %dir %{_datadir}/html + +%{_datadir}/errordocs +%dir %{_datadir}/icons +%{_datadir}/icons/*.gif +%{_datadir}/icons/*.png +%dir %{_datadir}/icons/small +%{_datadir}/icons/small/*.gif +%{_datadir}/icons/small/*.png +%attr(755,root,root) %{_datadir}/cgi-bin +%dir %{webappsdir} + +%files apxs +%defattr(644,root,root,755) +%attr(755,root,root) %{apxs} +%{_mandir}/man8/apxs1* + +%files tools +%defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/ab +%attr(755,root,root) %{_sbindir}/apachectl +%attr(755,root,root) %{_sbindir}/logresolve +%attr(755,root,root) %{_sbindir}/rotatelogs +%{_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/* + +%files index +%defattr(644,root,root,755) %config(noreplace,missingok) %{_datadir}/html/index.html # note: html extensions are not the same as (g)libc locale names %lang(ca) %{_datadir}/html/index.html.ca @@ -1568,7 +1637,7 @@ fi %lang(de_LU) %{_datadir}/html/index.html.lb.utf8 %lang(nl) %{_datadir}/html/index.html.nl %lang(nn) %{_datadir}/html/index.html.nn -%lang(no) %{_datadir}/html/index.html.no +%lang(nb) %{_datadir}/html/index.html.no %lang(pl) %{_datadir}/html/index.html.po.iso-pl %lang(pt) %{_datadir}/html/index.html.pt %lang(pt_BR) %{_datadir}/html/index.html.pt-br @@ -1580,18 +1649,8 @@ 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 -%dir %{_datadir}/icons -%{_datadir}/icons/*.gif -%{_datadir}/icons/*.png -%dir %{_datadir}/icons/small -%{_datadir}/icons/small/*.gif -%{_datadir}/icons/small/*.png -%attr(755,root,root) %{_datadir}/cgi-bin -%dir %{webappsdir} %files suexec %defattr(644,root,root,755) @@ -1619,6 +1678,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 @@ -1694,7 +1754,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