SPECS (DEVEL): proftpd.spec - adapter

[glen]

Author: glen                         Date: Sat Apr 29 10:59:41 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- adapter

---- Files affected:
SPECS:
   proftpd.spec (1.211.2.5 -> 1.211.2.6) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.5 SPECS/proftpd.spec:1.211.2.6
--- SPECS/proftpd.spec:1.211.2.5	Sat Apr 29 12:56:23 2006
+++ SPECS/proftpd.spec	Sat Apr 29 12:59:36 2006
@@ -51,21 +51,20 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libwrap-devel
-%{?with_mysql:BuildRequires:		mysql-devel}
+%{?with_quotamysql:BuildRequires:	mysql-devel}
 %{?with_quotamysql:BuildRequires:	mysql-devel}
 BuildRequires:	ncurses-devel
-%{?with_ldap:BuildRequires:		openldap-devel}
 %{?with_quotaldap:BuildRequires:	openldap-devel}
-%{?with_ssl:BuildRequires:		openssl-devel >= 0.9.7d}
+%{?with_quotaldap:BuildRequires:	openldap-devel}
+%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_pam:BuildRequires:		pam-devel}
-%{?with_pgsql:BuildRequires:		postgresql-devel}
+%{?with_quotapgsql:BuildRequires:	postgresql-devel}
 %{?with_quotapgsql:BuildRequires:	postgresql-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir		/etc/ftpd
 %define		_localstatedir	/var/run
 
-# There is no main package.
 %description
 
 %package common
@@ -119,23 +118,23 @@
 Summary:	inetd configs for proftpd
 Summary(pl):	Pliki konfiguracyjne do użycia proftpd poprzez inetd
 Group:		Daemons
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
-PreReq:		rc-inetd
 Requires(post):	fileutils
 Requires(post):	grep
 Requires(post):	sed >= 4.0
 Requires(triggerpostun):	sed >= 4.0
-Provides:	proftpd = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	rc-inetd
 Provides:	ftpserver
-Obsoletes:	proftpd-standalone
-Obsoletes:	ftpserver
+Provides:	proftpd = %{epoch}:%{version}-%{release}
 Obsoletes:	anonftp
 Obsoletes:	bftpd
 Obsoletes:	ftpd-BSD
+Obsoletes:	ftpserver
 Obsoletes:	glftpd
 Obsoletes:	heimdal-ftpd
 Obsoletes:	linux-ftpd
 Obsoletes:	muddleftpd
+Obsoletes:	proftpd-standalone
 Obsoletes:	pure-ftpd
 Obsoletes:	troll-ftpd
 Obsoletes:	vsftpd
@@ -152,24 +151,24 @@
 Summary:	Standalone daemon configs for proftpd
 Summary(pl):	Pliki konfiguracyjne do startowania proftpd w trybie standalone
 Group:		Daemons
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
-PreReq:		rc-scripts
-Requires(post,preun):	/sbin/chkconfig
 Requires(post):	fileutils
 Requires(post):	grep
 Requires(post):	sed >= 4.0
+Requires(post,preun):	/sbin/chkconfig
 Requires(triggerpostun):	sed >= 4.0
-Provides:	proftpd = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	rc-scripts
 Provides:	ftpserver
-Obsoletes:	proftpd-inetd
-Obsoletes:	ftpserver
+Provides:	proftpd = %{epoch}:%{version}-%{release}
 Obsoletes:	anonftp
 Obsoletes:	bftpd
 Obsoletes:	ftpd-BSD
+Obsoletes:	ftpserver
 Obsoletes:	glftpd
 Obsoletes:	heimdal-ftpd
 Obsoletes:	linux-ftpd
 Obsoletes:	muddleftpd
+Obsoletes:	proftpd-inetd
 Obsoletes:	pure-ftpd
 Obsoletes:	troll-ftpd
 Obsoletes:	vsftpd
@@ -414,6 +413,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211.2.6  2006/04/29 10:59:36  glen
+- adapter
+
 Revision 1.211.2.5  2006/04/29 10:56:23  glen
 - enable all modules as dso is possible now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.211.2.5&r2=1.211.2.6&f=u