- added extra-path /usr/lib64/openssl (amd64)

[packages/courier.git] / courier.spec

diff --git a/courier.spec b/courier.spec
index e0c253171cadce9559e74463282db7782565665f..c82985119e91219ea2a076aa3a352c24b3063e01 100644 (file)
--- a/courier.spec
+++ b/courier.spec
@@ -83,7 +83,7 @@ filtrowania spamu.
 Summary:       Courier Integrated POP3 server
 Summary(pl):   Zintegrowany serwer POP3 do Couriera
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{version}
 Requires(post):        openssl-tools >= 0.9.7c
 
 %description pop3d
@@ -104,7 +104,7 @@ obs
 Summary:       Courier Integrated IMAP server
 Summary(pl):   Zintegrowany serwer IMAP do Couriera
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{version}
 Requires(post):        openssl-tools >= 0.9.7c
 Obsoletes:     courier-imap
 Obsoletes:     courier-imap-common
@@ -138,7 +138,7 @@ pakietu automatycznie odinstaluje Courier-IMAP je
 Summary:       Courier Integrated HTTP (webmail) server
 Summary(pl):   Zintegrowany serwer poczty przez HTTP (webmail) do Couriera
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{version}
 Requires:      %{_cgibindir}
 Requires:      %{_documentrootdir}
 
@@ -166,7 +166,7 @@ SqWebMail, ale jego konfiguracja jest dostosowana do serwera Courier.
 Summary:       Courier Integrated Mailing List Manager
 Summary(pl):   Zintegrowany zarz±dca list dyskusyjnych do Couriera
 Group:         Applications/Mail
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{version}
 
 %description mlm
 This package installs couriermlm - a mailing list manager for the
@@ -193,7 +193,7 @@ aliasy pocztowe tylko do wysy
 Summary:       Courier Integrated mail filter
 Summary(pl):   Zintegrowany filtr poczty do Couriera
 Group:         Applications/Mail
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{version}
 
 %description maildrop
 This package installs Courier mail server's integrated mail filter.
@@ -208,7 +208,7 @@ potrzebny do filtrowania przychodz
 Summary:       Courier mail server authenticated ESMTP module
 Summary(pl):   Modu³ uwierzytelniania ESMTP (SMTP AUTH) do Couriera
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{version}
 
 %description smtpauth
 Authenticated ESMTP allows remote users to authenticate themselves and
@@ -223,7 +223,7 @@ Courier.
 Summary:        LDAP authentication daemon for Courier mail server
 Summary(pl):    Demon autentykacji LDAP do Couriera
 Group:          Networking/Daemons
-PreReq:         %{name} = %{version}
+PreReq:         %{name} = %{version}-%{version}
 
 %description authldap
 This package provides LDAP authentication for Courier.
@@ -235,7 +235,7 @@ Ten pakiet pozwala na korzystanie z autentykacji LDAP w Courierze.
 Summary:        MySQL authentication daemon for Courier mail server
 Summary(pl):    Demon autentykacji MySQL do Couriera
 Group:          Networking/Daemons
-PreReq:         %{name} = %{version}
+PreReq:         %{name} = %{version}-%{version}
 
 %description authmysql
 This package provides MySQL authentication for Courier.
@@ -247,7 +247,7 @@ Ten pakiet pozwala na korzystanie z autentykacji MySQL w Courierze.
 Summary:        PostgreSQL authentication daemon for Courier mail server
 Summary(pl):    Demon autentykacji PostgreSQL do Couriera
 Group:          Networking/Daemons
-PreReq:         %{name} = %{version}
+PreReq:         %{name} = %{version}-%{version}
 
 %description authpgsql
 This package provides PostgreSQL authentication for Courier.
@@ -268,7 +268,6 @@ rm -rf courier/module.fax
 cp -f /usr/share/automake/config.sub webmail
 
 cd rootcerts
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -281,7 +280,6 @@ cd authlib
 %{__automake}
 cd ..
 
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -313,9 +311,9 @@ for X in imap esmtp pop3 webmail calendar
 do
 cat > $RPM_BUILD_ROOT/etc/pam.d/$X <<EOF
 #%PAM-1.0
-auth       required     /lib/security/pam_unix.so shadow nullok
-account    required     /lib/security/pam_unix.so
-session    required     /lib/security/pam_unix.so
+auth       required     pam_unix.so shadow nullok
+account    required     pam_unix.so
+session    required     pam_unix.so
 EOF
 done
 
@@ -455,7 +453,7 @@ EOF
 
 # sendmail soft links
 
-ln -sf %{_bindir}/sendmail $RPM_BUILD_ROOT%{_prefix}/%{_lib}/sendmail
+ln -sf %{_bindir}/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail
 
 # This link by default is missing
 ln -sf %{_datadir}/esmtpd-ssl $RPM_BUILD_ROOT%{_sbindir}/esmtpd-ssl
@@ -814,7 +812,7 @@ fi
 %attr(755,daemon,daemon) %dir %{_localstatedir}/calendar
 %attr(755,daemon,daemon) %dir %{_localstatedir}/tmp/broken
 %attr(755,root,root) %{_bindir}/sendmail
-%attr(755,root,root) %{_prefix}/%{_lib}/sendmail
+%attr(755,root,root) /usr/lib/sendmail
 
 %files pop3d
 %defattr(644,root,root,755)