- fix includes/libs for external apr/apr-util

Changed files:
    apache.spec -> 1.249

diff --git a/apache.spec b/apache.spec
index 77f9bd68dcc9f73f814666d6d310f5f637f653ed..18146e5639b113344e4c7e5c3664b9ebac6a9110 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -171,8 +171,9 @@ Summary(pt_BR):     Arquivos de inclus
 Summary(ru):   óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
 Group:         Networking/Utilities
 Requires:      %{name} = %{version}
-Requires:      apr-devel >= 1:0.9.3
+Requires:      apr-util-devel >= 1:0.9.3
 Requires:      libtool
+Obsoletes:     %{name}-static
 
 %description devel
 The apache-devel package contains header files for Apache.
@@ -201,18 +202,6 @@ utilit
 (DSOs). Este pacote precisa ser instalado se você deseja compilar ou
 desenvolver módulos adicionais para o Apache.
 
-%package static
-Summary:       Static Apache web server libraries
-Summary(pl):   Statyczne biblioteki serwera WWW Apache
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
-
-%description static
-The apache-static package contains static libraries for Apache.
-
-%description static -l pl
-Statyczne biblioteki serwera Apache.
-
 %package mod_actions
 Summary:       Apache module for run CGI whenever a file of a certain type is requested
 Summary(pl):   Modu³ Apache'a do uruchamiania skryptów CGI
@@ -1222,18 +1211,13 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/[!a]*
-%{_includedir}/ap[!r]*
+%{_includedir}
 %{_libexecdir}/*.exp
 %attr(755,root,root) %dir %{_libexecdir}/build
 %attr(644,root,root) %{_libexecdir}/build/*.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh
 %attr(755,root,root) %{_libexecdir}/build/libtool
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
-
 %files mod_actions
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_actions.conf