- apache.rpm main package provides only stuff that was in apache-2.0.rpm

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 7ca509d06772e45d24f510ce10afef88eddc3da2..0117afc5fbe8569b715c43161d736478cc999933 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -35,7 +35,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.2.0
-Release:       7
+Release:       9
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -66,7 +66,6 @@ Source22:     %{name}-mod_userdir.conf
 Source23:      %{name}-mpm.conf
 Source24:      %{name}-languages.conf
 Source25:      %{name}-mod_mime.conf
-Source26:      %{name}-mod_alias.conf
 Source27:      %{name}-mod_authz_host.conf
 Source28:      %{name}-mod_cgid.conf
 Source29:      %{name}-mod_log_config.conf
@@ -115,12 +114,12 @@ BuildRequires:    rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
+# packages that were in apache-2.0.rpm, for compatibility
 Requires:      %{name}-errordocs = %{version}-%{release}
 Requires:      %{name}-mod_alias = %{version}-%{release}
-#Requires:     %{name}-mod_asis = %{version}-%{release}
+Requires:      %{name}-mod_asis = %{version}-%{release}
 Requires:      %{name}-mod_authz_host = %{version}-%{release}
-Requires:      %{name}-mod_autoindex = %{version}-%{release}
-#Requires:     %{name}-mod_cern_meta = %{version}-%{release}
+Requires:      %{name}-mod_cern_meta = %{version}-%{release}
 Requires:      %{name}-mod_cgi = %{version}-%{release}
 Requires:      %{name}-mod_env = %{version}-%{release}
 Requires:      %{name}-mod_include = %{version}-%{release}
@@ -1480,7 +1479,7 @@ according to whether different aspects of the request match regular
 expressions you specify. These environment variables can be used by
 other parts of the server to make decisions about actions to be taken.
 
-%description mod_setenvif
+%description mod_setenvif -l pl
 Modu³ mod_setenvif pozwala na ustawianie zmiennych ¶rodowiskowych w
 zale¿no¶ci od ró¿nych aspektów ¿±dania pasuj±cych do podanych wyra¿eñ
 regularnych. Te zmienne ¶rodowiskowe mog± byæ u¿ywane przez inne
@@ -1882,7 +1881,6 @@ CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/"
 install %{SOURCE7} $CFG/10_common.conf
 
 install %{SOURCE25} $CFG/01_mod_mime.conf
-install %{SOURCE26} $CFG/80_cgi-bin.conf
 install %{SOURCE27} $CFG/01_mod_authz_host.conf
 install %{SOURCE28} $CFG/01_mod_cgid.conf
 install %{SOURCE29} $CFG/01_mod_log_config.conf
@@ -2009,6 +2007,7 @@ if [ ! -L /etc/httpd/httpd.conf ]; then
        fi
 
        # always have httpd.conf symlink (until all packages from Ac use new dir)
+       install -d /etc/httpd
        ln -s conf.d /etc/httpd/httpd.conf
 fi
 exit 0
@@ -2327,7 +2326,6 @@ fi
 %files mod_alias
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_alias.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_cgi-bin.conf
 %attr(755,root,root) %{_libexecdir}/mod_alias.so
 
 %files mod_asis