- version++

- removed unneeded man2html from spec
- fixed manual sections numeration in spec
- added couriertcpd.8 in spec
- removed unused variable from myownquery.patch

Changed files:
    courier-imap-myownquery.patch -> 1.4
    courier-imap.spec -> 1.55

diff --git a/courier-imap-myownquery.patch b/courier-imap-myownquery.patch
index a1626229895476621ca151f38110c407d14a7b25..ac750e8050ed2c4c9257e3ea0b96793c4a08d63e 100644 (file)
--- a/courier-imap-myownquery.patch
+++ b/courier-imap-myownquery.patch
@@ -688,13 +688,13 @@ diff -Nur courier-imap-1.3.12.orig/authlib/authmysqllib.c courier-imap-1.3.12/au
 +static int parse_core  (const char *source, struct var_data *vdt,
 +                      parsefunc outfn, void *result)
 +{
-+int   ret;
 +size_t        v_size          = 0,
 +      t_size          = 0;
 +const char    *p, *q, *e,
 +              *v_begin, *v_end,
 +              *t_begin, *t_end;
 +struct var_data       *v_ptr;
++ 
 +
 +      if (!source)
 +              source = "";

diff --git a/courier-imap.spec b/courier-imap.spec
index ef5d049694b4a3a234d2e376c6f45650f01c15d9..5632388dbcd51dd3ad17d06e2ce8b593750beee6 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -6,7 +6,7 @@
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       1.4.0
+Version:       1.4.1
 Release:       1
 License:       GPL
 Group:         Networking/Daemons
@@ -202,7 +202,8 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/*db \
 mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert \
        $RPM_BUILD_ROOT%{_sbindir}
 
-imap/html2man.pl tcpd/couriertls.html > $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
+mv -f tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.1
+mv -f imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
 
 echo ".so authlib.8"   >$RPM_BUILD_ROOT%{_mandir}/man8/authcram.8
 echo ".so authlib.8"   >$RPM_BUILD_ROOT%{_mandir}/man8/authpam.8
@@ -347,8 +348,8 @@ fi
 %attr(755,root,root) %{_libexecdir}/logger
 %attr(755,root,root) %{_libexecdir}/makedatprog
 %{_mandir}/man8/auth[cdpsuv]*
-%{_mandir}/man8/authlib*
-%{_mandir}/man8/couriert*
+%{_mandir}/man7/authlib*
+%{_mandir}/man1/couriert*
 %{_mandir}/man8/mk*
 
 %files userdb
@@ -382,6 +383,7 @@ fi
 %attr(755,root,root) %{_sbindir}/mkpop3dcert
 %attr(755,root,root) %{_sbindir}/pop3login
 %{_sysconfdir}/pop3d.cnf
+%{_mandir}/man8/courierpop*
 
 %if %{?_without_ldap:0}%{!?_without_ldap:1}
 %files authldap