- release 0.3

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 3b53d4a27a8db6df5f5f2ce61f00948913ccf1e9..93079130cfef6fc858ebec2bb4d6e7c7c350ef10 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -22,8 +22,8 @@ Summary(pl):  Serwer WWW (World Wide Web)
 Summary(pt_BR):        Servidor HTTPD para prover serviços WWW
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
-Version:       2.0.43
-Release:       0.2
+Version:       2.0.44
+Release:       0.3
 License:       Apache Group License
 Group:         Networking/Daemons
 URL:           http://httpd.apache.org/
@@ -46,34 +46,36 @@ Patch0:             %{name}-apxs.patch
 Patch1:                %{name}-configdir_skip_backups.patch
 Patch2:                %{name}-layout.patch
 Patch3:                %{name}-suexec.patch
-Patch4:                %{name}-db.patch
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.6f}
-%{!?_without_ssl:BuildRequires:        openssl-tools}
 BuildRequires: db-devel
-BuildRequires: zlib-devel
 BuildRequires: expat-devel
+BuildRequires: gdbm-devel >= 1.8.3
+%{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.7}
+%{!?_without_ssl:BuildRequires:        openssl-tools >= 0.9.7}
 BuildRequires: perl-devel >= 5.004
-BuildRequires: gdbm-devel
-BuildRequires: byacc
 BuildRequires: rpm-perlprov >= 4.0.4
-Provides:      httpd = %{version}
-Provides:      webserver = %{version}
-Prereq:                /sbin/chkconfig
-Prereq:                /usr/sbin/useradd
-Prereq:                /usr/bin/getgid
-Prereq:                /bin/id
-Prereq:                sh-utils
-Prereq:                rc-scripts
-Prereq:                perl
+BuildRequires: zlib-devel
+PreReq:                perl
+PreReq:                rc-scripts
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(post,preun):  /sbin/chkconfig
+Requires(post,postun): /sbin/ldconfig
+Requires(post):        fileutils
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
 Requires:      mailcap
 Requires:      /etc/mime.types
 Requires:      psmisc >= 20.1
 Requires:      libtool
+Provides:      httpd = %{version}
+Provides:      webserver = %{version}
 Obsoletes:     apache-extra
 Obsoletes:     apache6
 Obsoletes:     apache-doc
 Obsoletes:     indexhtml
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/httpd
 %define                _includedir     %{_prefix}/include/apache
@@ -579,7 +581,6 @@ Statyczne biblioteki APR.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %configure \
@@ -714,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 if [ -n "`getgid http`" ]; then
        if [ "`getgid http`" != "51" ]; then
-               echo "Warning: group http haven't gid=51. Correct this before installing apache" 1>&2
+               echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2
                exit 1
        fi
 else
@@ -722,7 +723,7 @@ else
 fi
 if [ -n "`id -u http 2>/dev/null`" ]; then
        if [ "`id -u http`" != "51" ]; then
-               echo "Warning: user http haven't uid=51. Correct this before installing apache" 1>&2
+               echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2
                exit 1
        fi
 else
@@ -1077,12 +1078,12 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
-%post -n apr -p /sbin/ldconfig
+%post  -n apr -p /sbin/ldconfig
 %postun -n apr -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc ABOUT_APACHE CHANGES README ROADMAP
+%doc ABOUT_APACHE CHANGES README 
 %doc docs/conf/mime.types
 
 %attr(754,root,root) /etc/rc.d/init.d/httpd
@@ -1214,8 +1215,8 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}
-%exclude %{_includedir}/apr*.h
+%{_includedir}/[!a]*
+%{_includedir}/ap[!r]*
 %{_libexecdir}/*.exp
 
 %files static
@@ -1383,8 +1384,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/apr-config
 %attr(755,root,root) %{_bindir}/apu-config
+%dir %{_includedir}
 %{_includedir}/apr*.h
-#%{_libdir}/APRVARS
+#%%{_libdir}/APRVARS
 %{_libdir}/apr*.exp
 %attr(755,root,root) %{_libdir}/libapr*.so
 %{_libdir}/libapr*.la