diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index c875dcb..7d06038 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 18 13:06:35 UTC 2012 - aj@suse.de + +- Move some doc files from cyrus-sasl to here. + ------------------------------------------------------------------- Fri Nov 25 10:05:58 UTC 2011 - rhafer@suse.de diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index fd1d63d..61f32f5 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-saslauthd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: cyrus-sasl-saslauthd BuildRequires: db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel postgresql-devel BuildRequires: libtool -License: BSD4c(or similar) +License: BSD-4-Clause Group: Productivity/Networking/Other Url: http://asg.web.cmu.edu/sasl/ Summary: The SASL Authentication Server @@ -43,7 +43,7 @@ This daemon is required when using cyrus-sasl in server software that should authenticate with PAM, for example. %package -n cyrus-sasl-ldap-auxprop -License: BSD4c(or similar) +License: BSD-4-Clause Summary: The cyrus-sasl LDAP auxprop plugin Group: Productivity/Networking/Other Requires: cyrus-sasl = %{version} @@ -53,7 +53,7 @@ The LDAP auxprop plugin allows for tighter application/directory integration. %package -n cyrus-sasl-sqlauxprop -License: BSD4c(or similar) +License: BSD-4-Clause Summary: SQL auxprop plugin for cyrus-sasl Group: Development/Libraries/C and C++ Requires: cyrus-sasl = %{version} @@ -139,6 +139,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsql.la /usr/sbin/* /usr/bin/* %doc %{_mandir}/man8/*.gz +%doc saslauthd/AUTHORS saslauthd/COPYING saslauthd/ChangeLog saslauthd/LDAP_SASLAUTHD saslauthd/NEWS saslauthd/README %files -n cyrus-sasl-sqlauxprop %defattr(-,root,root) diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index c875dcb..bf23bbf 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 18 13:06:00 UTC 2012 - aj@suse.de + +- Move some doc files to devel package and to cyrus-sasl-saslauthd. + ------------------------------------------------------------------- Fri Nov 25 10:05:58 UTC 2011 - rhafer@suse.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index c549793..15faa53 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Version: 2.1.25 Release: 14 BuildRequires: db-devel krb5-mini-devel openssl-devel opie pam-devel BuildRequires: libtool -License: BSD4c(or similar) +License: BSD-4-Clause Group: Productivity/Networking/Other Url: http://asg.web.cmu.edu/sasl/ # bug437293 @@ -44,55 +44,55 @@ PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %package gssapi -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the GSSAPI SASL mechanism Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %package crammd5 -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the CRAMMD5 SASL mechanism Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %package digestmd5 -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the DIGESTMD5 SASL mechanism Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %package otp -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the OTP SASL mechanism Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %package plain -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the PLAIN SASL mechanism Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %package ntlm -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the NTLM SASL mechanism Group: Productivity/Networking/Other Requires: %{name} = %{version} %package gs2 -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the GS2 SASL mechanism Group: Productivity/Networking/Other Requires: %{name} = %{version} %package scram -License: BSD4c(or similar) +License: BSD-4-Clause Summary: Plugin for the SCRAM SASL mechanism Group: Productivity/Networking/Other Requires: %{name} = %{version} %package devel -License: BSD4c(or similar) +License: BSD-4-Clause # bug437293 %ifarch ppc64 Obsoletes: cyrus-sasl-devel-64bit @@ -210,8 +210,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec %{__rm} -fv {} + /usr/bin/* %doc %{_mandir}/man3/sasl.*.gz %doc %{_mandir}/man8/*.gz -%doc AUTHORS COPYING ChangeLog NEWS README doc -%doc saslauthd/AUTHORS saslauthd/COPYING saslauthd/ChangeLog saslauthd/LDAP_SASLAUTHD saslauthd/NEWS saslauthd/README +%doc COPYING %files gssapi %defattr(-,root,root) @@ -247,6 +246,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec %{__rm} -fv {} + %files devel %defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README doc /usr/include/sasl %doc %{_mandir}/man3/sasl_*.gz %{_libdir}/libsasl2.so