- glen is a genious, simplify obsoletes section at htpasswd,

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index caa8e38665e70879c94ff096f9f6637300fba45d..173e6779020052895135c47601ff24dcf55d4c9f 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -15,6 +15,7 @@
 # - subpackages for MPMs
 # - check if all modules (*.so) are exactly the same for different MPMs
 # - install stage fails with distcc (make -jN)
+# - polish description and summary at package htpasswd
 #
 # Conditional build:
 %bcond_without ssl             # build without SSL support
@@ -34,7 +35,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.0.53
-Release:       2.1
+Release:       3.2
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -703,6 +704,7 @@ Modu
 Summary:       Apache2 htpasswd utility
 Group:         Networking/Utilities
 Provides:      htpasswd
+Obsoletes:     htpasswd
 
 %description -n htpasswd-%{name}
 htpasswd from Apache2
@@ -951,6 +953,7 @@ find $RPM_BUILD_ROOT%{_datadir}/manual -type f \
 
 # htpasswd goes to %{_bindir}
 mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}/
+ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1742,4 +1745,5 @@ fi
 %files -n htpasswd-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/htpasswd
+%{_sbindir}/htpasswd
 %{_mandir}/man1/htpasswd.1*