Author: djrzulf Date: Fri Mar 4 07:57:28 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - htpasswd into seperate package, Rel 4, STBR AC-TEST,
---- Files affected: SPECS: thttpd.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/thttpd.spec diff -u SPECS/thttpd.spec:1.45 SPECS/thttpd.spec:1.46 --- SPECS/thttpd.spec:1.45 Thu Mar 3 13:16:53 2005 +++ SPECS/thttpd.spec Fri Mar 4 08:57:23 2005 @@ -11,7 +11,7 @@ Summary(pl): Nieduży serwer HTTP do dużych obciążeń Name: thttpd Version: 2.25b -Release: 3 +Release: 4 Group: Networking License: BSD Source0: http://www.acme.com/software/thttpd/%{name}-%{version}.tar.gz @@ -56,6 +56,7 @@ Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel +Requires: htpasswd Provides: group(thttp) Provides: user(thttp) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -76,6 +77,19 @@ Dostarczane jest podstawowe wsparcie dla skryptów CGI, uwierzytelniania, oraz SSI. +%package -n htpasswd-%{name} +Summary: thttpd htpasswd utility +Group: Networking/Utilities +Provides: htpasswd +Obsoletes: htpasswd-apache1 +Obsoletes: htpasswd-apache2 + +%description -n htpasswd-%{name} +htpasswd from thttpd + +Usage: htpasswd [-c] passwordfile username +The -c flag creates a new file. + %prep %setup -q %patch0 -p1 @@ -155,22 +169,25 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/home/services/%{name}/{cgi-bin,html},%{_sbindir}} \ +install -d $RPM_BUILD_ROOT{/home/services/%{name}/{cgi-bin,html},%{_sbindir},%{_bindir}} \ $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir},%{_mandir}/man{1,8}} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir} install thttpd $RPM_BUILD_ROOT%{_sbindir} -install extras/{htpasswd,makeweb,syslogtocern} $RPM_BUILD_ROOT%{_sbindir} +install extras/{makeweb,syslogtocern} $RPM_BUILD_ROOT%{_sbindir} install cgi-bin/printenv $RPM_BUILD_ROOT/home/services/%{name}/cgi-bin install cgi-src/{phf,redirect,ssi} $RPM_BUILD_ROOT/home/services/%{name}/cgi-bin install cgi-src/{redirect.8,ssi.8} $RPM_BUILD_ROOT%{_mandir}/man8 -# htpasswd.1 confilcts with apache, so temporary commented -#install extras/{htpasswd.1,makeweb.1} $RPM_BUILD_ROOT%{_mandir}/man1 install extras/makeweb.1 $RPM_BUILD_ROOT%{_mandir}/man1 install extras/syslogtocern.8 $RPM_BUILD_ROOT%{_mandir}/man8 install thttpd.8 $RPM_BUILD_ROOT%{_mandir}/man8 +# htpasswd +install extras/htpasswd $RPM_BUILD_ROOT%{_bindir} +ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir} +install extras/htpasswd.1 $RPM_BUILD_ROOT%{_mandir}/man1 + %if %{with php} cd php-%{php_version} %{__make} install \ @@ -228,13 +245,21 @@ %doc php-%{php_version}/{LICENSE,NEWS} %endif %attr(2755,thttp,thttp) %{_sbindir}/makeweb -%attr(755,root,root) %{_sbindir}/htpasswd %attr(755,root,root) %{_sbindir}/syslogtocern %attr(755,root,root) %{_sbindir}/%{name} %attr(-,root,root) /home/services/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %{_sysconfdir}/%{name}.conf -%{_mandir}/man*/* +%{_mandir}/man*/m* +%{_mandir}/man*/r* +%{_mandir}/man*/s* +%{_mandir}/man*/t* + +%files -n htpasswd-%{name} +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/htpasswd +%{_sbindir}/htpasswd +%{_mandir}/man1/htpasswd.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -242,6 +267,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.46 2005/03/04 07:57:23 djrzulf +- htpasswd into seperate package, Rel 4, STBR AC-TEST, + Revision 1.45 2005/03/03 12:16:53 djrzulf - added todo, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/thttpd.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
