From 6e004bd16712e4c3ee620168f28e32e6bc84c6d3 Mon Sep 17 00:00:00 2001
From: Graham Leggett <minfrin@apache.org>
Date: Tue, 29 Jun 2004 12:39:38 +0000
Subject: [PATCH] RPM spec file changes: changed default dependancy to link to
 db4 instead of db3. Fixed complaints about unpackaged files. PR: Obtained
 from: Submitted by: Reviewed by:	minfrin, nd, iholsman

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104076 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES                 |  4 ++++
 STATUS                  |  7 +------
 build/rpm/httpd.spec.in | 10 +++++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 810a4daa0ea..61b3d029887 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.51
 
+  *) RPM spec file changes: changed default dependancy to link to db4
+     instead of db3. Fixed complaints about unpackaged files.
+     [Graham Leggett]
+ 
 Changes with Apache 2.0.50
 
   *) SECURITY: CAN-2004-0493 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index d9cbb48f642..b563e767bc5 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/06/29 10:35:07 $]
+Last modified at [$Date: 2004/06/29 12:39:37 $]
 
 Release:
 
@@ -101,11 +101,6 @@ PATCHES TO BACKPORT FROM 2.1
        PR 24922 [Pascal Terjan <pterjan@linuxfr.org>]
        +1: minfrin, nd, jim
 
-    *) RPM spec file changes: changed default dependancy to link to db4
-       instead of db3. Fixed complaints about unpackaged files.
-       build/rpm/httpd.spec.in: r1.5
-       +1: minfrin, nd, iholsman
-
     *) Prevent Win32 pool corruption at startup
          server/mpm/winnt/child.c: r1.36 
        +1: ake, trawick, nd, stoddard
diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index ae1ebfcec0e..c8a04d81d38 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -17,7 +17,7 @@ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 License: Apache License, Version 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: openldap-devel, db3-devel, expat-devel, findutils, perl, pkgconfig
+BuildPrereq: openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig
 Requires: gawk, /usr/share/magic.mime, /usr/bin/find, openldap
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
 Prereq: sh-utils, textutils, /usr/sbin/useradd
@@ -335,6 +335,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{contentdir}/error
 %dir %{contentdir}/error/include
 %{contentdir}/icons/*
+%{contentdir}/error/README
 %config(noreplace) %{contentdir}/error/*.var
 %config(noreplace) %{contentdir}/error/include/*.html
 
@@ -344,6 +345,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/*
 
+%{_mandir}/man8/apachectl*
+%{_mandir}/man8/httpd*
 %{_mandir}/man8/rotatelogs*
 %{_mandir}/man8/suexec*
 
@@ -366,13 +369,18 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libapr-0.so
+%{_libdir}/libapr-0.a
+%{_libdir}/libapr-0.la
 %{_libdir}/libaprutil-0.so
+%{_libdir}/libaprutil-0.a
+%{_libdir}/libaprutil-0.la
 %{_includedir}/httpd
 %{_sysconfdir}/httpd/build
 %{_sbindir}/apxs
 %{_mandir}/man8/apxs.8*
 %dir %{_libdir}/httpd/build
 %{_libdir}/httpd/build/*.mk
+%{_libdir}/httpd/build/config.nice
 %{_libdir}/httpd/build/instdso.sh
 %{_libdir}/httpd/build/libtool
 
-- 
2.47.2