# TODO
# - split *all* modules to subpackages?
-#
+# - polish description and summary at package htpasswd
# Conditional build:
%bcond_with rewrite_ldap # enable ldap map support for mod_rewrite (alpha)
%bcond_without ipv6 # disable IPv6 support
Summary(zh_CN): Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
Name: apache1
Version: 1.3.33
-Release: 3.2
+Release: 3.3
License: Apache Group
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
Summary(pl): Modu³ autentykacji u¿ytkownika przy u¿yciu plików tekstowych dla Apache
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
+Requires: htpasswd
Provides: apache(mod_auth) = %{version}-%{release}
Obsoletes: apache-mod_auth < 2.0.0
Modu³ umo¿liwia na dynamiczne konfigurowanie masowej ilo¶ci serwerów
wirtualnych.
+%package -n htpasswd-%{name}
+Summary: Apache1 htpasswd utility
+Group: Networking/Utilities
+Provides: htpasswd
+Obsoletes: htpasswd-apache2
+Obsoletes: htpasswd-thttpd
+
+%description -n htpasswd-%{name}
+htpasswd from Apache1
+
+Usage:
+ htpasswd [-cmdpsD] passwordfile username
+ htpasswd -b[cmdpsD] passwordfile username password
+
+ htpasswd -n[mdps] username
+ htpasswd -nb[mdps] username password
+ -c Create a new file.
+ -n Don't update file; display results on stdout.
+ -m Force MD5 encryption of the password.
+ -d Force CRYPT encryption of the password (default).
+ -p Do not encrypt the password (plaintext).
+ -s Force SHA encryption of the password.
+ -b Use the password from the command line rather than prompting for it.
+ -D Delete the specified user.
+
%prep
%setup -q -n apache_%{version} -a3
%patch0 -p1
ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
ln -s /var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
+#htpasswd
+ln -sf ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}/
+
%clean
rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_auth.conf
%attr(755,root,root) %{_libexecdir}/mod_auth.so
-# FIXME apache2 puts in sbin
+
+%files -n htpasswd-%{name}
%attr(755,root,root) %{_bindir}/htpasswd
+%{_sbindir}/htpasswd
%{_mandir}/man1/htpasswd.1*
%files mod_auth_anon