Author: djrzulf                      Date: Fri Mar  4 07:34:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- htpasswd into seperate package (vide pld-devil-pl),

---- Files affected:
SPECS:
   apache.spec (1.370 -> 1.371) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.370 SPECS/apache.spec:1.371
--- SPECS/apache.spec:1.370     Wed Feb 23 16:59:11 2005
+++ SPECS/apache.spec   Fri Mar  4 08:34:13 2005
@@ -35,7 +35,7 @@
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.0.53
-Release:       2
+Release:       2.1
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -292,6 +292,7 @@
 Group:         Networking/Daemons
 Provides:      apache(mod_auth) = %{version}-%{release}
 Requires:      %{name} = %{version}-%{release}
+Requires:      htpasswd
 
 %description mod_auth
 This package contains mod_auth module. It provides for user
@@ -699,6 +700,29 @@
 %description mod_file_cache -l pl
 Moduł cache'ujący statyczną listę plików w pamięci.
 
+%package -n htpasswd-%{name}
+Summary:       Apache2 htpasswd utility
+Group:         Networking/Utilities
+Provides:      htpasswd
+
+%description -n htpasswd-%{name}
+htpasswd from Apache2
+
+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 httpd-%{version}
 %patch0 -p1
@@ -926,6 +950,9 @@
        -name '*.xml' -o -name '*.xml.*' -o -name '*.html' \
        | xargs rm -f
 
+# htpasswd goes to %{_bindir}
+mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1579,8 +1606,6 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/httpd.conf/*_mod_auth.conf
 %attr(755,root,root) %{_libexecdir}/mod_auth.so
-%attr(755,root,root) %{_sbindir}/htpasswd
-%{_mandir}/man1/htpasswd.1*
 
 %files mod_auth_anon
 %defattr(644,root,root,755)
@@ -1715,12 +1740,20 @@
 %attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) 
%{_sysconfdir}/httpd.conf/*_mod_vhost_alias.conf
 
+%files -n htpasswd-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/htpasswd
+%{_mandir}/man1/htpasswd.1*
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.371  2005/03/04 07:34:13  djrzulf
+- htpasswd into seperate package (vide pld-devil-pl),
+
 Revision 1.370  2005/02/23 15:59:11  glen
 - rel 2; STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.370&r2=1.371&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to