Author: djrzulf Date: Fri Mar 4 10:29:22 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added obsoletes,
- htpasswd from mini_httpd moved to separate package, Rel 3,
---- Files affected:
SPECS:
apache.spec (1.373 -> 1.374) , apache1.spec (1.79 -> 1.80) , mini_httpd.spec
(1.22 -> 1.23) , thttpd.spec (1.47 -> 1.48)
---- Diffs:
================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.373 SPECS/apache.spec:1.374
--- SPECS/apache.spec:1.373 Fri Mar 4 11:06:46 2005
+++ SPECS/apache.spec Fri Mar 4 11:29:16 2005
@@ -707,6 +707,7 @@
Provides: htpasswd
Obsoletes: htpasswd-apache1
Obsoletes: htpasswd-thttpd
+Obsoletes: htpasswd-mini_httpd
%description -n htpasswd-%{name}
htpasswd from Apache2
@@ -1756,6 +1757,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.374 2005/03/04 10:29:16 djrzulf
+- added obsoletes,
+- htpasswd from mini_httpd moved to separate package, Rel 3,
+
Revision 1.373 2005/03/04 10:06:46 djrzulf
- TODO updated,
================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.79 SPECS/apache1.spec:1.80
--- SPECS/apache1.spec:1.79 Fri Mar 4 11:05:54 2005
+++ SPECS/apache1.spec Fri Mar 4 11:29:16 2005
@@ -773,6 +773,7 @@
Provides: htpasswd
Obsoletes: htpasswd-apache2
Obsoletes: htpasswd-thttpd
+Obsoletes: htpasswd-mini_httpd
%description -n htpasswd-%{name}
htpasswd from Apache1
@@ -1877,6 +1878,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.80 2005/03/04 10:29:16 djrzulf
+- added obsoletes,
+- htpasswd from mini_httpd moved to separate package, Rel 3,
+
Revision 1.79 2005/03/04 10:05:54 djrzulf
- NFY,
================================================================
Index: SPECS/mini_httpd.spec
diff -u SPECS/mini_httpd.spec:1.22 SPECS/mini_httpd.spec:1.23
--- SPECS/mini_httpd.spec:1.22 Fri Oct 29 11:27:53 2004
+++ SPECS/mini_httpd.spec Fri Mar 4 11:29:16 2005
@@ -1,9 +1,12 @@
# $Revision$, $Date$
+# TODO:
+# - polish description and summary at package htpasswd
+#
Summary: Small, simple HTTP daemon, supports SSL
Summary(pl): Mały, prosty serwer HTTP ze wsparciem dla SSL
Name: mini_httpd
Version: 1.19
-Release: 2
+Release: 3
License: freely distributable
Group: Networking/Daemons
URL: http://www.acme.com/software/mini_httpd/
@@ -15,6 +18,7 @@
BuildRequires: sed
PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: htpasswd
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define httpdir /home/services/httpd
@@ -26,6 +30,20 @@
%description -l pl
Prosty i mały serwer HTTP ze wsparciem dla SSL.
+%package -n htpasswd-%{name}
+Summary: mini_httpd htpasswd utility
+Group: Networking/Utilities
+Provides: htpasswd
+Obsoletes: htpasswd-apache1
+Obsoletes: htpasswd-apache2
+Obsoletes: htpasswd-thttpd
+
+%description -n htpasswd-%{name}
+htpasswd from mini_httpd
+
+Usage: htpasswd [-c] passwordfile username
+The -c flag creates a new file.
+
%prep
%setup -q
@@ -50,8 +68,9 @@
install -d $RPM_BUILD_ROOT/etc/sysconfig
install mini_httpd $RPM_BUILD_ROOT%{_sbindir}
-install htpasswd $RPM_BUILD_ROOT%{_bindir}/mini_htpasswd
-install htpasswd.1 $RPM_BUILD_ROOT%{_mandir}/man1/mini_htpasswd.1
+install htpasswd $RPM_BUILD_ROOT%{_bindir}/htpasswd
+ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
+install htpasswd.1 $RPM_BUILD_ROOT%{_mandir}/man1/htpasswd.1
install *.8 $RPM_BUILD_ROOT%{_mandir}/man8
install index.html $RPM_BUILD_ROOT%{htmldir}
@@ -75,14 +94,20 @@
%files
%defattr(644,root,root,755)
%doc README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/mini_httpd
%dir %{httpdir}
%dir %{htmldir}
%{htmldir}/index.html
%attr(754,root,root) /etc/rc.d/init.d/mini_httpd
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5)
/etc/sysconfig/%{name}
-%{_mandir}/man*/*
+%{_mandir}/man8/*
+
+%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
@@ -90,6 +115,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2005/03/04 10:29:16 djrzulf
+- added obsoletes,
+- htpasswd from mini_httpd moved to separate package, Rel 3,
+
Revision 1.22 2004/10/29 09:27:53 paladine
- "HTTP" and "HTTPS" unification
================================================================
Index: SPECS/thttpd.spec
diff -u SPECS/thttpd.spec:1.47 SPECS/thttpd.spec:1.48
--- SPECS/thttpd.spec:1.47 Fri Mar 4 11:06:46 2005
+++ SPECS/thttpd.spec Fri Mar 4 11:29:16 2005
@@ -84,6 +84,7 @@
Provides: htpasswd
Obsoletes: htpasswd-apache1
Obsoletes: htpasswd-apache2
+Obsoletes: htpasswd-mini_httpd
%description -n htpasswd-%{name}
htpasswd from thttpd
@@ -268,6 +269,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2005/03/04 10:29:16 djrzulf
+- added obsoletes,
+- htpasswd from mini_httpd moved to separate package, Rel 3,
+
Revision 1.47 2005/03/04 10:06:46 djrzulf
- TODO updated,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.373&r2=1.374&f=u
http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.79&r2=1.80&f=u
http://cvs.pld-linux.org/SPECS/mini_httpd.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/thttpd.spec?r1=1.47&r2=1.48&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
