Author: glen Date: Tue Mar 7 08:01:22 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - drop Provides: httpd
---- Files affected: SPECS: mathopd.spec (1.23 -> 1.24) , resin-cmp.spec (1.36 -> 1.37) , resin.spec (1.31 -> 1.32) , thttpd.spec (1.55 -> 1.56) , wn.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: SPECS/mathopd.spec diff -u SPECS/mathopd.spec:1.23 SPECS/mathopd.spec:1.24 --- SPECS/mathopd.spec:1.23 Tue Dec 13 14:58:51 2005 +++ SPECS/mathopd.spec Tue Mar 7 09:01:16 2006 @@ -4,8 +4,8 @@ Name: mathopd Version: 1.5 Release: 1 -Group: Networking License: BSD +Group: Networking Source0: http://www.mathopd.org/dist/%{name}-%{version}p3.tar.gz # Source0-md5: 6e0fea187134cb52509c2f98a8644d11 Source1: %{name}.init @@ -22,7 +22,6 @@ Requires(pre): /usr/sbin/useradd Requires(pre): sh-utils Provides: group(http) -Provides: httpd Provides: user(http) Provides: webserver BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -109,6 +108,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2006/03/07 08:01:16 glen +- drop Provides: httpd + Revision 1.23 2005/12/13 13:58:51 glen - adapterized (sorted %verify attrs) ================================================================ Index: SPECS/resin-cmp.spec diff -u SPECS/resin-cmp.spec:1.36 SPECS/resin-cmp.spec:1.37 --- SPECS/resin-cmp.spec:1.36 Tue Dec 13 16:14:18 2005 +++ SPECS/resin-cmp.spec Tue Mar 7 09:01:16 2006 @@ -28,17 +28,16 @@ BuildRequires: jdk >= 1.2 BuildRequires: libtool >= 1.4 BuildRequires: openssl-devel >= 0.9.7d -Requires: rc-scripts Requires(post,preun): /sbin/chkconfig Requires: jdk >= 1.2 +Requires: rc-scripts Requires: sed # it's known it's better to use apache as HTTP server, but # resin itself has got httpd too. -Provides: httpd -Provides: webserver +Provides: ejb Provides: jsp Provides: servlet -Provides: ejb +Provides: webserver Conflicts: resin BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -296,6 +295,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2006/03/07 08:01:16 glen +- drop Provides: httpd + Revision 1.36 2005/12/13 15:14:18 glen - adapterized (sorted %verify attrs) ================================================================ Index: SPECS/resin.spec diff -u SPECS/resin.spec:1.31 SPECS/resin.spec:1.32 --- SPECS/resin.spec:1.31 Mon Jun 6 00:04:29 2005 +++ SPECS/resin.spec Tue Mar 7 09:01:16 2006 @@ -24,19 +24,18 @@ URL: http://www.caucho.com/resin/ BuildRequires: apache-devel BuildRequires: jdk >= 1.2 +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(post,preun): /sbin/chkconfig # for running even kaffe should be enough, since it's java 1.1 Requires: jre >= 1.1 -# Provides: httpd # Provides: webserver -Provides: jsp Provides: group(http) +Provides: jsp Provides: servlet Provides: user(http) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -229,6 +228,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2006/03/07 08:01:16 glen +- drop Provides: httpd + Revision 1.31 2005/06/05 22:04:29 ankry - more requires() ================================================================ Index: SPECS/thttpd.spec diff -u SPECS/thttpd.spec:1.55 SPECS/thttpd.spec:1.56 --- SPECS/thttpd.spec:1.55 Thu Aug 11 11:46:18 2005 +++ SPECS/thttpd.spec Tue Mar 7 09:01:16 2006 @@ -10,8 +10,8 @@ Name: thttpd Version: 2.25b Release: 5 -Group: Networking License: BSD +Group: Networking Source0: http://www.acme.com/software/thttpd/%{name}-%{version}.tar.gz # Source0-md5: a0e9cd87455d3a0ea11e5ea7e947adf6 Source1: %{name}.init @@ -43,18 +43,17 @@ BuildRequires: mysql-devel %endif BuildRequires: rpmbuild(macros) >= 1.202 -PreReq: rc-scripts -Requires(pre): sh-utils +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires(post,preun): /sbin/chkconfig -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel +Requires(pre): sh-utils Requires: htpasswd +Requires: rc-scripts Provides: group(thttp) -Provides: httpd Provides: user(thttp) Provides: webserver BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -257,6 +256,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.56 2006/03/07 08:01:16 glen +- drop Provides: httpd + Revision 1.55 2005/08/11 09:46:18 radek - bcond_with(out) is followed by one \t, then bcond's name. ================================================================ Index: SPECS/wn.spec diff -u SPECS/wn.spec:1.13 SPECS/wn.spec:1.14 --- SPECS/wn.spec:1.13 Wed Nov 30 09:30:32 2005 +++ SPECS/wn.spec Tue Mar 7 09:01:16 2006 @@ -1,7 +1,6 @@ # $Revision$, $Date$ -# -# Todo: -# bcond with digest and with ndbm authorization (Im not gonna do it) +# TODO: +# - bcond with digest and with ndbm authorization (I'm not gonna do it) # %bcond_with suexec # enable suexec %bcond_with vhosts # enable vhosts @@ -25,21 +24,20 @@ BuildRequires: pam-devel BuildRequires: perl-base BuildRequires: rpmbuild(macros) >= 1.202 -%{?with_vhosts:BuildRequires: sed >= 4.0} -Requires: /etc/mime.types +%{?with_vhosts:BuildRequires: sed >= 4.0} +Requires(post): fileutils +Requires(post,postun): /sbin/ldconfig +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(post,preun): /sbin/chkconfig -Requires(post,postun): /sbin/ldconfig -Requires(post): fileutils +Requires: /etc/mime.types Provides: group(http) -Provides: httpd = %{version} Provides: user(http) -Provides: webserver = %{version} +Provides: webserver BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -188,6 +186,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2006/03/07 08:01:16 glen +- drop Provides: httpd + Revision 1.13 2005/11/30 08:30:32 qboosh - pl fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mathopd.spec?r1=1.23&r2=1.24&f=u http://cvs.pld-linux.org/SPECS/resin-cmp.spec?r1=1.36&r2=1.37&f=u http://cvs.pld-linux.org/SPECS/resin.spec?r1=1.31&r2=1.32&f=u http://cvs.pld-linux.org/SPECS/thttpd.spec?r1=1.55&r2=1.56&f=u http://cvs.pld-linux.org/SPECS/wn.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
