X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1.spec;h=0b184061c14d0fab26d695307dc4ee5cdbeb2e0f;hb=f7ca584549bc84dfc4827d786748558b21517376;hp=3654c7a182ce3d92c4e52b3819d8453f257f0986;hpb=79041c2836905d1c154ea0e701074bddfea0fbaf;p=packages%2Fapache1.git diff --git a/apache1.spec b/apache1.spec index 3654c7a..0b18406 100644 --- a/apache1.spec +++ b/apache1.spec @@ -27,20 +27,21 @@ Summary(tr.UTF-8): Lider WWW tarayıcı Summary(uk.UTF-8): Найпопулярніший Web-Server Summary(zh_CN.UTF-8): Internet 上应用最广泛的 Web 服务程序。 Name: apache1 -Version: 1.3.39 -Release: 7.1 -License: Apache Group +Version: 1.3.41 +Release: 5 +License: Apache v2.0 Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz -# Source0-md5: 76066f630203291acd20c764e5eedb6e +# Source0-md5: f7f00b635243f03a787ca9f4d4c85651 Source1: %{name}.init Source2: %{name}.logrotate -Source3: apache-icons.tar.gz -# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83 -Source4: %{name}.sysconfig +Source3: %{name}.sysconfig +# http://www.iagora.com/about/software/lingerd/ +Source4: http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz +# Source4-md5: 6401015bafad4f44fdf8a9a1795d9258 Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e - +Source6: %{name}-defaultindex.conf Source7: %{name}-httpd.conf Source8: %{name}-common.conf Source9: %{name}-mod_status.conf @@ -59,9 +60,7 @@ Source21: %{name}-mod_cern_meta.conf Source22: %{name}-mod_setenvif.conf Source23: %{name}-mod_vhost_alias.conf Source24: %{name}-errordocs.conf -# http://www.iagora.com/about/software/lingerd/ -Source25: http://images.iagora.com/media/software/lingerd/lingerd-0.94.tar.gz -# Source25-md5: 6401015bafad4f44fdf8a9a1795d9258 +Source25: %{name}-manual.conf Patch0: %{name}-PLD.patch Patch1: %{name}-suexec.patch Patch2: %{name}-errordocs.patch @@ -128,6 +127,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir %{_prefix}/%{_lib}/%{name} %define apxs /usr/sbin/apxs1 %define httpdir /home/services/apache +%define docroot %{_datadir}/%{name}/html +%define errordir %{_datadir}/%{name}/error %define manualdir %{_datadir}/%{name}/manual %define cgibindir %{_prefix}/lib/cgi-bin/%{name} @@ -325,36 +326,46 @@ Apache tools. %description tools -l pl.UTF-8 Narzędzia Apache'a. -%package index +%package defaultindex Summary: Apache index.html* files Summary(pl.UTF-8): Pliki Apache index.html* Group: Documentation Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: %{name}-mod_dir = %{version}-%{release} +Provides: apache1-index +Obsoletes: apache1-index < 1.3.39-7.9 Obsoletes: indexhtml -%description index +%description defaultindex Apache index.html* files. -%description index -l pl.UTF-8 +%description defaultindex -l pl.UTF-8 Pliki Apache index.html*. -%package doc +%package manual Summary: Apache 1.3.x manual Summary(pl.UTF-8): Podręcznik do Apache'a 1.3.x Group: Documentation Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} +Requires: %{name}-mod_negotiation = %{version}-%{release} +Provides: apache1-doc +Obsoletes: apache1-doc < 1.3.39-7.9 -%description doc +%description manual Apache 1.3.x manual. -%description doc -l pl.UTF-8 +%description manual -l pl.UTF-8 Podręcznik do Apache'a 1.3.x. %package errordocs Summary: Apache 1.3.x HTTP error documents Summary(pl.UTF-8): Dokumenty opisujące błędy HTTP dla Apache'a 1.3.x Group: Applications/WWW +Requires: %{name}-mod_alias = %{version}-%{release} Requires: %{name}-mod_include = %{version}-%{release} +Requires: %{name}-mod_negotiation = %{version}-%{release} %description errordocs Apache 1.3.x HTTP error documents. Currently in English and Polish @@ -655,6 +666,7 @@ Summary(pl.UTF-8): Moduł apache do wyświetlania indeksu plików Group: Networking/Daemons Requires(triggerpostun): sed >= 4.0 Requires: %{name}(EAPI) = %{version}-%{release} +Requires: %{name}-mod_alias = %{version}-%{release} Requires: apache-icons Provides: apache(mod_autoindex) = %{version}-%{release} @@ -1281,7 +1293,7 @@ Two cgi test/demo programs: test-cgi and print-env. Dwa programy testowe/przykładowe cgi: test-cgi and print-env. %prep -%setup -q -n apache_%{version} %{?with_lingerd:-a25} +%setup -q -n apache_%{version} %{?with_lingerd:-a4} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -1333,6 +1345,9 @@ cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main %patch42 -p1 %endif +# make manual link with full path +%{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.* + # fix libdir (at least in PLD layout; no need to care about other ones) %{__sed} -i -e 's,/lib$,/%{_lib},' config.layout @@ -1380,7 +1395,7 @@ rm -f src/modules/standard/mod_rewrite.so rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \ - $RPM_BUILD_ROOT%{httpdir} \ + $RPM_BUILD_ROOT%{httpdir}/html \ $RPM_BUILD_ROOT%{_libexecdir} \ $RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache} @@ -1389,15 +1404,15 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ 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 +install %{SOURCE3} $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 -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/errordocs -cp -a errordocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/errordocs +install -d $RPM_BUILD_ROOT%{errordir} +cp -a errordocs/* $RPM_BUILD_ROOT%{errordir} mv $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf conf/apache.conf.dist cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf @@ -1422,6 +1437,8 @@ echo "LoadModule speling_module modules/mod_speling.so" > $CFG/15_mod_spelin cp -a %{SOURCE15} $CFG/16_mod_userdir.conf cp -a %{SOURCE8} $CFG/20_common.conf +cp -a %{SOURCE6} $CFG/30_defaultindex.conf +cp -a %{SOURCE25} $CFG/30_manual.conf cp -a %{SOURCE23} $CFG/20_mod_vhost_alias.conf cp -a %{SOURCE9} $CFG/25_mod_status.conf @@ -1452,7 +1469,7 @@ ScriptAlias /cgi-bin/printenv %{cgibindir}/printenv ScriptAlias /cgi-bin/test-cgi %{cgibindir}/test-cgi EOF -ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/%{name}/html/index.html +ln -sf index.html.en $RPM_BUILD_ROOT%{docroot}/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 @@ -1473,8 +1490,6 @@ rm -f $RPM_BUILD_ROOT%{_libexecdir}/mod_{auth_dbm,example}.so rm -f $RPM_BUILD_ROOT%{_mandir}/README* rm -rf $RPM_BUILD_ROOT%{_datadir}/apache-icons -install -d $RPM_BUILD_ROOT%{_datadir}/apache-icons -%{__tar} -zxf %{SOURCE3} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/apache-icons # Not for our os or for older apache rm $RPM_BUILD_ROOT%{manualdir}/{cygwin,ebcdic,install-{z,}tpf,man-template}.html @@ -1531,7 +1546,7 @@ if [ "$1" = "2" ]; then ' /etc/apache/apache.conf fi -%triggerpostun base -- %{name} <= 1.3.31-5 +%triggerpostun base -- %{name} < 1.3.31-5.9 %banner %{name} -e -a <