- provide virtual apache(mod_MODNAME) for each module

- fix apache1(ipv6)-devel provide

Changed files:
    apache1.spec -> 1.77

diff --git a/apache1.spec b/apache1.spec
index fb003c5eebd9609834d73b67a7e062e6ed586ad5..3c097754ff941fa1974c532eb31d3ae8f56b511b 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -29,7 +29,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.33
-Release:       3
+Release:       3.1
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -112,7 +112,7 @@ Provides:   httpd
 Provides:      user(http)
 Provides:      webserver = apache
 Provides:      apache = %{version}-%{release}
-%{?with_ipv6:Provides: apache(ipv6)}
+%{?with_ipv6:Provides: apache1(ipv6)}
 Obsoletes:     apache < 2.0.0
 Obsoletes:     apache-extra
 Obsoletes:     apache6
@@ -333,7 +333,7 @@ Group:              Networking/Utilities
 Requires:      %{name}-apxs = %{version}-%{release}
 Provides:      %{name}(EAPI)-devel = %{version}-%{release}
 Provides:      apache(EAPI)-devel = %{version}-%{release}
-%{?with_ipv6:Provides: apache(ipv6)-devel}
+%{?with_ipv6:Provides: apache1(ipv6)-devel}
 Obsoletes:     apache-devel < 2.0.0
 
 %description devel
@@ -393,7 +393,7 @@ Summary:    Apache module for run CGI whenever a file of a certain type is requeste
 Summary(pl):   Modu³ dla apache do uruchamiania skryptów cgi
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_actions = %{version}-%{release}
+Provides:      apache(mod_actions) = %{version}-%{release}
 Obsoletes:     apache-mod_actions < 2.0.0
 
 %description mod_actions
@@ -410,7 +410,7 @@ Summary:    Apache module with user authentication using textual files
 Summary(pl):   Modu³ autentykacji u¿ytkownika przy u¿yciu plików tekstowych dla Apache
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_auth = %{version}-%{release}
+Provides:      apache(mod_auth) = %{version}-%{release}
 Obsoletes:     apache-mod_auth < 2.0.0
 
 %description mod_auth
@@ -426,7 +426,7 @@ Summary:    Apache module with "anonymous" user access authentication
 Summary(pl):   Modu³ apache oferuj±cy anonimow± autoryzacjê u¿ytkownia
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_auth_anon = %{version}-%{release}
+Provides:      apache(mod_auth_anon) = %{version}-%{release}
 Obsoletes:     apache-mod_auth_anon < 2.0.0
 
 %description mod_auth_anon
@@ -452,7 +452,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_auth_db = %{version}-%{release}
+Provides:      apache(mod_auth_db) = %{version}-%{release}
 Obsoletes:     apache-mod_auth_db < 2.0.0
 
 %description mod_auth_db
@@ -471,7 +471,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Obsoletes:     %{name}-mod_digest
-Provides:      apache-mod_auth_digest = %{version}-%{release}
+Provides:      apache(mod_auth_digest) = %{version}-%{release}
 Obsoletes:     apache-mod_auth_digest < 2.0.0
 
 %description mod_auth_digest
@@ -487,7 +487,7 @@ Summary:    Apache module - display index of files
 Summary(pl):   Modu³ apache do wy¶wietlania indeksu plików
 Group:         Networking/Daemons
 Requires(triggerpostun):       %{apxs}
-Provides:      apache-mod_autoindex = %{version}-%{release}
+Provides:      apache(mod_autoindex) = %{version}-%{release}
 Requires:      %{name}(EAPI) = %{version}-%{release}
 
 %description mod_autoindex
@@ -502,7 +502,7 @@ Summary:    Apache module - authentication variables for arbitrary directives
 Summary(pl):   Modu³ apache do definiowania zmiennych
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_define = %{version}-%{release}
+Provides:      apache(mod_define) = %{version}-%{release}
 Obsoletes:     apache-mod_define < 2.0.0
 
 %description mod_define
@@ -517,7 +517,7 @@ Summary:    Older version of apache user authentication module using MD5 Digest Aut
 Summary(pl):   Starsza wersja modu³u apache do autoryzacji MD5
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_digest = %{version}-%{release}
+Provides:      apache(mod_digest) = %{version}-%{release}
 Obsoletes:     apache-mod_digest < 2.0.0
 
 %description mod_digest
@@ -540,7 +540,7 @@ Summary:    Apache module for "trailing slash" redirects and serving directory inde
 Summary(pl):   Modu³ oferuj±cy przekierowania i serwowanie indeksu katalogu.
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_dir = %{version}-%{release}
+Provides:      apache(mod_dir) = %{version}-%{release}
 Obsoletes:     apache-mod_dir < 2.0.0
 
 %description mod_dir
@@ -555,7 +555,7 @@ Summary:    Apache module which generates Expires HTTP headers
 Summary(pl):   Modu³ generuj±cy nag³ówki HTTP Expires
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_expires = %{version}-%{release}
+Provides:      apache(mod_expires) = %{version}-%{release}
 Obsoletes:     apache-mod_expires < 2.0.0
 
 %description mod_expires
@@ -574,7 +574,7 @@ Summary:    Apache module allows for the customization of HTTP response headers
 Summary(pl):   Modu³ pozwalaj±cy na modyfikacjê nag³ówków HTTP
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_headers = %{version}-%{release}
+Provides:      apache(mod_headers) = %{version}-%{release}
 Obsoletes:     apache-mod_headers < 2.0.0
 
 %description mod_headers
@@ -591,7 +591,7 @@ Summary:    Apache module with imap-file handler
 Summary(pl):   Modu³ z obs³ug± imap-file
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_imap = %{version}-%{release}
+Provides:      apache(mod_imap) = %{version}-%{release}
 Obsoletes:     apache-mod_imap < 2.0.0
 
 %description mod_imap
@@ -607,7 +607,7 @@ Summary:    Apache module with comprehensive overview of the server configuration
 Summary(pl):   Modu³ dostarczaj±cy informacji na temat serwera.
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_info = %{version}-%{release}
+Provides:      apache(mod_info) = %{version}-%{release}
 Obsoletes:     apache-mod_info < 2.0.0
 
 %description mod_info
@@ -624,7 +624,7 @@ Summary:    Apache module for forensic logging of the requests
 Summary:       Modu³ Apache'a do logowania ¿±dañ w celu pó¼niejszej analizy
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_log_forensic = %{version}-%{release}
+Provides:      apache(mod_log_forensic) = %{version}-%{release}
 Obsoletes:     apache-mod_log_forensic < 2.0.0
 
 %description mod_log_forensic
@@ -640,7 +640,7 @@ Summary:    Apache module for mmap()ing statically configured list files
 Summary(pl):   Modu³ s³u¿±cy do mmap()owania plików.
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_mmap_static = %{version}-%{release}
+Provides:      apache(mod_mmap_static) = %{version}-%{release}
 Obsoletes:     apache-mod_mmap_static < 2.0.0
 
 %description mod_mmap_static
@@ -658,7 +658,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_proxy = %{version}-%{release}
+Provides:      apache(mod_proxy) = %{version}-%{release}
 Obsoletes:     apache-mod_proxy < 2.0.0
 
 %description mod_proxy
@@ -677,7 +677,7 @@ Summary:    Apache module with rule-based engine for rewrite requested URLs on the
 Summary(pl):   Modu³ do ,,przepisywania'' adresów URL w locie
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_rewrite = %{version}-%{release}
+Provides:      apache(mod_rewrite) = %{version}-%{release}
 Obsoletes:     apache-mod_rewrite < 2.0.0
 
 %description mod_rewrite
@@ -693,7 +693,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_status = %{version}-%{release}
+Provides:      apache(mod_status) = %{version}-%{release}
 Obsoletes:     apache-mod_status < 2.0.0
 
 %description mod_status
@@ -712,7 +712,7 @@ Summary:    Apache module which provides a magic token for each request
 Summary(pl):   Modu³ nadaj±cy ka¿demu ¿±daniu unikalny token
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_unique_id = %{version}-%{release}
+Provides:      apache(mod_unique_id) = %{version}-%{release}
 Obsoletes:     apache-mod_unique_id < 2.0.0
 
 %description mod_unique_id
@@ -735,7 +735,7 @@ Summary:    Apache module for user tracking using cookies
 Summary(pl):   Modu³ s³u¿±cy do ¶ledzenia u¿ytkowników przy u¿yciu ciasteczek
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_usertrack = %{version}-%{release}
+Provides:      apache(mod_usertrack) = %{version}-%{release}
 Obsoletes:     apache-mod_usertrack < 2.0.0
 
 %description mod_usertrack
@@ -754,7 +754,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_vhost_alias = %{version}-%{release}
+Provides:      apache(mod_vhost_alias) = %{version}-%{release}
 Obsoletes:     apache-mod_vhost_alias < 2.0.0
 
 %description mod_vhost_alias