pass paths to makemap to respect config dir

diff --git a/makemap-paths.patch b/makemap-paths.patch
new file mode 100644 (file)
index 0000000..8b3d55b
--- /dev/null
+++ b/makemap-paths.patch
@@ -0,0 +1,15 @@
+--- opensmtpd-201310231634p1/mk/makemap/Makefile.am~   2013-10-23 16:41:36.000000000 +0300
++++ opensmtpd-201310231634p1/mk/makemap/Makefile.am    2013-11-03 01:28:42.542110133 +0200
+@@ -43,6 +43,12 @@
+ CFLAGS+=              -D_GNU_SOURCE
+ CPPFLAGS=             -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+ 
++PATHS=                        -DSMTPD_CONFDIR=\"$(sysconfdir)\"                       \
++                      -DPATH_SMTPCTL=\"$(sbindir)/smtpctl\"                   \
++                      -DPATH_MAILLOCAL=\"$(pkglibexecdir)/mail.local\"        \
++                      -DPATH_FILTERS=\"$(pkglibexecdir)\"                     \
++                      -DPATH_TABLES=\"$(pkglibexecdir)\"
++
+ MANPAGES=             makemap.8.out newaliases.8.out
+ MANPAGES_IN=          $(smtpd_srcdir)/makemap.8
+ MANPAGES_IN+=         $(smtpd_srcdir)/newaliases.8

diff --git a/opensmtpd.spec b/opensmtpd.spec
index d77b130562b9bb6b5b5933820531e894534afb5b..bf828fe2446e2b650306614a2ac5051f1014e2ab 100644 (file)
--- a/opensmtpd.spec
+++ b/opensmtpd.spec
@@ -4,7 +4,7 @@
 # Conditional build:
 %bcond_without pam             # build without PAM support
 
-%define        rel     0.2
+%define        rel     0.3
 %define        prerelease      201310231634
 Summary:       Free implementation of the server-side SMTP protocol as defined by RFC 5321
 Name:          opensmtpd
@@ -20,7 +20,9 @@ Source2:      %{name}.init
 Source3:       %{name}.pam
 Source4:       aliases
 Patch0:                chroot-path.patch
+Patch1:                makemap-paths.patch
 URL:           http://www.opensmtpd.org/
+BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: db-devel
@@ -63,8 +65,13 @@ re-usable by everyone under an ISC license.
 %prep
 %setup -q %{?prerelease: -n %{name}-%{prerelease}p1}
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --sysconfdir=%{_sysconfdir}/mail \
        --libexecdir=%{_libdir}/%{name} \