Author: qboosh Date: Sat Sep 17 11:54:03 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- opie now could be used as underlying mechanism in OTP plugin (instead of
internal code), not a separate plugin
---- Files affected:
packages/cyrus-sasl:
cyrus-sasl.spec (1.208 -> 1.209)
---- Diffs:
================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.208
packages/cyrus-sasl/cyrus-sasl.spec:1.209
--- packages/cyrus-sasl/cyrus-sasl.spec:1.208 Sat Sep 17 13:30:14 2011
+++ packages/cyrus-sasl/cyrus-sasl.spec Sat Sep 17 13:53:58 2011
@@ -11,8 +11,8 @@
%bcond_without sqlite # do not enable sqlite 2 plugin
%bcond_without sqlite3 # do not enable sqlite 3 plugin
%bcond_with authlib # enable courier-authlib (i wasn't able to test
it)
-%bcond_with opie # enable opie plugin
-%bcond_with srp # build srp pluggin
+%bcond_with opie # OTP plugin using opie library instead of
internal code
+%bcond_with srp # build srp plugin
%bcond_with pwcheck # build pwcheck helper (deprecated)
#
%if %{without mysql} && %{without pgsql}
@@ -73,7 +73,7 @@
%{?with_sqlite3:BuildRequires: sqlite3-devel >= 3}
Requires: pam >= 0.79.0
Requires: %{name}-libs = %{version}-%{release}
-Obsoletes: cyrus-sasl-x509
+Obsoletes: cyrus-sasl-x509 < %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/sasl
@@ -293,26 +293,13 @@
%description mysql -l pl.UTF-8
Wtyczka MySQL do Cyrus SASL.
-%package opie
-Summary: OPIE Cyrus SASL plugin
-Summary(pl.UTF-8): Wtyczka OPIE do Cyrus SASL
-Summary(pt_BR.UTF-8): Mecanismo SASL OPIE
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description opie
-This plugin implements the SASL OPIE (One Time Password) mechanism.
-
-%description opie -l pl.UTF-8
-Wtyczka dodająca obsługę mechanizmu OPIE (hasła jednorazowe) do Cyrus
-SASL.
-
%package otp
Summary: OTP Cyrus SASL plugin
Summary(pl.UTF-8): Wtyczka OTP do Cyrus SASL
Summary(pt_BR.UTF-8): Mecanismo SASL OTP
Group: Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: cyrus-sasl-opie < %{version}
%description otp
This plugin implements the SASL OTP (One Time Password) mechanism.
@@ -692,12 +679,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/sasl2/libotp.so*
-%if %{with opie}
-%files opie
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libopie.so*
-%endif
-
%if %{with pgsql}
%files pgsql
%defattr(644,root,root,755)
@@ -768,6 +749,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.209 2011/09/17 11:53:58 qboosh
+- opie now could be used as underlying mechanism in OTP plugin (instead of
internal code), not a separate plugin
+
Revision 1.208 2011/09/17 11:30:14 qboosh
- there is no x509 plugin, added to Obsoletes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.208&r2=1.209&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
