Attachment 2933 Details for Bug 7727 – the fix

[patch] the fix

courier-authlib.spec.diff (text/plain), 2.91 KB, created by Oden Eriksson on 2012-10-07 11:33:45 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Oden Eriksson

Created: 2012-10-07 11:33:45 CEST

Size: 2.91 KB

patch

obsolete

>--- courier-authlib.spec	2012-10-07 11:28:16.458741155 +0200
>+++ courier-authlib.spec.oden	2012-10-07 11:32:08.370820271 +0200
>@@ -1,6 +1,6 @@
> %define name    courier-authlib
> %define version 0.63.0
>-%define release %mkrel 12
>+%define release %mkrel 13
> 
> Name:           %{name}
> Version:        %{version}
>@@ -23,6 +23,9 @@
> Obsoletes:      courier-imap-utils
> Obsoletes:      libcourier-authlib0
> Conflicts:      courier-imap <= 3.0.8
>+# because %{_sysconfdir}/ld.so.conf.d/courier-authlib.conf and *.so files 
>+# were moved from courier-authlib-devel (fixes #7727)
>+Conflicts:	courier-authlib-devel < 0.63.0-13
> 
> %description
> The Courier authentication library provides authentication
>@@ -261,18 +264,19 @@
> %doc NEWS COPYING* AUTHORS ChangeLog liblock/lockmail.html liblog/courierlogger.html
> %dir %{_sysconfdir}/courier
> %dir %{_libdir}/courier-authlib
>+%{_sysconfdir}/ld.so.conf.d/courier-authlib.conf
> %{_libdir}/courier-authlib/authmigrate
> %{_libdir}/courier-authlib/authsystem.passwd
> %{_libdir}/courier-authlib/sysconftool
>-%{_libdir}/courier-authlib/libcourierauthsaslclient.so.*
>-%{_libdir}/courier-authlib/libcourierauthsasl.so.*
>-%{_libdir}/courier-authlib/libcourierauthcommon.so.*
>-%{_libdir}/courier-authlib/libcourierauth.so.*
>-%{_libdir}/courier-authlib/libauthcustom.so.0
>-%{_libdir}/courier-authlib/libauthpam.so.0
>-%{_libdir}/courier-authlib/libauthpwd.so.0
>-%{_libdir}/courier-authlib/libauthshadow.so.0
>-%{_libdir}/courier-authlib/libauthpipe.so.0
>+%{_libdir}/courier-authlib/libcourierauthsaslclient.so*
>+%{_libdir}/courier-authlib/libcourierauthsasl.so*
>+%{_libdir}/courier-authlib/libcourierauthcommon.so*
>+%{_libdir}/courier-authlib/libcourierauth.so*
>+%{_libdir}/courier-authlib/libauthcustom.so*
>+%{_libdir}/courier-authlib/libauthpam.so*
>+%{_libdir}/courier-authlib/libauthpwd.so*
>+%{_libdir}/courier-authlib/libauthshadow.so*
>+%{_libdir}/courier-authlib/libauthpipe.so*
> %{_mandir}/man1/*
> 
> %files -n courier-authdaemon
>@@ -297,28 +301,26 @@
> %{_sbindir}/userdb
> %{_sbindir}/userdb-test-cram-md5
> %{_sbindir}/userdbpw
>-%{_libdir}/courier-authlib/libauthuserdb.so.0
>+%{_libdir}/courier-authlib/libauthuserdb.so*
> %{_mandir}/man8/*userdb*
> 
> %files ldap
> %doc README.ldap authldap.schema
> %config(noreplace) %{_sysconfdir}/courier/authldaprc
>-%{_libdir}/courier-authlib/libauthldap.so.0
>+%{_libdir}/courier-authlib/libauthldap.so*
> 
> %files mysql
> %doc README.authmysql.html README.authmysql.myownquery
> %config(noreplace) %{_sysconfdir}/courier/authmysqlrc
>-%{_libdir}/courier-authlib/libauthmysql.so.0
>+%{_libdir}/courier-authlib/libauthmysql.so*
> 
> %files pgsql
> %doc README.authpostgres.html
> %config(noreplace) %{_sysconfdir}/courier/authpgsqlrc
>-%{_libdir}/courier-authlib/libauthpgsql.so.0
>+%{_libdir}/courier-authlib/libauthpgsql.so*
> 
> %files devel
> %doc authlib.html auth_*.html
> %{_bindir}/courierauthconfig
>-%{_libdir}/courier-authlib/*.so
> %{_includedir}/*
> %{_mandir}/man3/*
>-%{_sysconfdir}/ld.so.conf.d/courier-authlib.conf

--- courier-authlib.spec	2012-10-07 11:28:16.458741155 +0200
+++ courier-authlib.spec.oden	2012-10-07 11:32:08.370820271 +0200
@@ -1,6 +1,6 @@
 %define name    courier-authlib
 %define version 0.63.0
-%define release %mkrel 12
+%define release %mkrel 13
 
 Name:           %{name}
 Version:        %{version}
@@ -23,6 +23,9 @@
 Obsoletes:      courier-imap-utils
 Obsoletes:      libcourier-authlib0
 Conflicts:      courier-imap <= 3.0.8
+# because %{_sysconfdir}/ld.so.conf.d/courier-authlib.conf and *.so files 
+# were moved from courier-authlib-devel (fixes #7727)
+Conflicts:	courier-authlib-devel < 0.63.0-13
 
 %description
 The Courier authentication library provides authentication
@@ -261,18 +264,19 @@
 %doc NEWS COPYING* AUTHORS ChangeLog liblock/lockmail.html liblog/courierlogger.html
 %dir %{_sysconfdir}/courier
 %dir %{_libdir}/courier-authlib
+%{_sysconfdir}/ld.so.conf.d/courier-authlib.conf
 %{_libdir}/courier-authlib/authmigrate
 %{_libdir}/courier-authlib/authsystem.passwd
 %{_libdir}/courier-authlib/sysconftool
-%{_libdir}/courier-authlib/libcourierauthsaslclient.so.*
-%{_libdir}/courier-authlib/libcourierauthsasl.so.*
-%{_libdir}/courier-authlib/libcourierauthcommon.so.*
-%{_libdir}/courier-authlib/libcourierauth.so.*
-%{_libdir}/courier-authlib/libauthcustom.so.0
-%{_libdir}/courier-authlib/libauthpam.so.0
-%{_libdir}/courier-authlib/libauthpwd.so.0
-%{_libdir}/courier-authlib/libauthshadow.so.0
-%{_libdir}/courier-authlib/libauthpipe.so.0
+%{_libdir}/courier-authlib/libcourierauthsaslclient.so*
+%{_libdir}/courier-authlib/libcourierauthsasl.so*
+%{_libdir}/courier-authlib/libcourierauthcommon.so*
+%{_libdir}/courier-authlib/libcourierauth.so*
+%{_libdir}/courier-authlib/libauthcustom.so*
+%{_libdir}/courier-authlib/libauthpam.so*
+%{_libdir}/courier-authlib/libauthpwd.so*
+%{_libdir}/courier-authlib/libauthshadow.so*
+%{_libdir}/courier-authlib/libauthpipe.so*
 %{_mandir}/man1/*
 
 %files -n courier-authdaemon
@@ -297,28 +301,26 @@
 %{_sbindir}/userdb
 %{_sbindir}/userdb-test-cram-md5
 %{_sbindir}/userdbpw
-%{_libdir}/courier-authlib/libauthuserdb.so.0
+%{_libdir}/courier-authlib/libauthuserdb.so*
 %{_mandir}/man8/*userdb*
 
 %files ldap
 %doc README.ldap authldap.schema
 %config(noreplace) %{_sysconfdir}/courier/authldaprc
-%{_libdir}/courier-authlib/libauthldap.so.0
+%{_libdir}/courier-authlib/libauthldap.so*
 
 %files mysql
 %doc README.authmysql.html README.authmysql.myownquery
 %config(noreplace) %{_sysconfdir}/courier/authmysqlrc
-%{_libdir}/courier-authlib/libauthmysql.so.0
+%{_libdir}/courier-authlib/libauthmysql.so*
 
 %files pgsql
 %doc README.authpostgres.html
 %config(noreplace) %{_sysconfdir}/courier/authpgsqlrc
-%{_libdir}/courier-authlib/libauthpgsql.so.0
+%{_libdir}/courier-authlib/libauthpgsql.so*
 
 %files devel
 %doc authlib.html auth_*.html
 %{_bindir}/courierauthconfig
-%{_libdir}/courier-authlib/*.so
 %{_includedir}/*
 %{_mandir}/man3/*
-%{_sysconfdir}/ld.so.conf.d/courier-authlib.conf

Actions: View | Diff

Attachments on bug 7727: 2933