- up to 1.0.9

- fix ac issues

diff --git a/ac.patch b/ac.patch
new file mode 100644 (file)
index 0000000..1d2dad4
--- /dev/null
+++ b/ac.patch
@@ -0,0 +1,22 @@
+--- courier-1.0.9/libs/pcp/configure.ac~       2018-07-29 04:31:27.000000000 +0200
++++ courier-1.0.9/libs/pcp/configure.ac        2019-12-05 22:20:54.236362325 +0100
+@@ -23,7 +23,7 @@
+ 
+ CFLAGS="-I.. -I${srcdir}/.. -I$srcdir/../.. -I../.. $CFLAGS"
+ ALL_LINGUAS=""
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ AC_PATH_PROGS(COURIERAUTHCONFIG, courierauthconfig)
+ 
+--- courier-1.0.9/libs/sqwebmail/configure.ac~ 2019-08-29 02:09:32.000000000 +0200
++++ courier-1.0.9/libs/sqwebmail/configure.ac  2019-12-05 22:33:09.629079684 +0100
+@@ -252,8 +252,6 @@
+   fi
+   AC_DEFINE_UNQUOTED(USE_LIBCHARSET, 1,
+       [ Set this to 1 to use libcharset library. ])
+-else
+-  AM_LANGINFO_CODESET
+ fi
+ 
+ dnl Other

diff --git a/courier.spec b/courier.spec
index fb47460ae6426a141a86a6392625013bc920f898..0b1d8ce5f58d599e3e8b89e51ce22c1b4ec5fb74 100644 (file)
--- a/courier.spec
+++ b/courier.spec
@@ -12,18 +12,19 @@
 Summary:       Courier mail server
 Summary(pl.UTF-8):     Serwer poczty Courier
 Name:          courier
-Version:       1.0.4
+Version:       1.0.9
 Release:       1
 License:       GPL v3 with OpenSSL exception
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 2227a73ca745aabef5eb57dda0b0d30d
+# Source0-md5: 3a716dd3eabadb991ffcc4ee9d06afa0
 Patch1:                %{name}-withoutfam.patch
 Patch2:                %{name}-maildir.patch
 Patch3:                %{name}-sendmail_dir.patch
 Patch4:                %{name}-start_scripts.patch
 Patch5:                %{name}-certs.patch
 Patch6:                %{name}-filterbindir.patch
+Patch7:                ac.patch
 URL:           http://www.courier-mta.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -305,6 +306,7 @@ wysyłać faksy wysyłając po prostu e-maila na numertelefonu@fax.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 cat >apache.conf <<EOF
 Alias /webmail %{_imagedir}
@@ -326,7 +328,7 @@ find -type f -a -name configure.ac | while read FILE; do
                sed -i -e '/_[L]DFLAGS=-static/d' Makefile.am
        fi
 
-       %{__aclocal}
+       %{__aclocal} -I m4
        %{__autoconf}
        if grep -q AC_CONFIG_HEADER configure.ac; then
                %{__autoheader}