diff -r 9d786c9d3d15 -r 434e5cc73d47 imap/imap.spec --- a/imap/imap.spec Tue Aug 28 18:32:15 2012 +0200 +++ b/imap/imap.spec Tue Aug 28 18:33:10 2012 +0200 @@ -22,9 +22,9 @@ ## # package version -%define V_here 2007e -%define V_real 2007e -%define V_subdir 2007e +%define V_here 2007f +%define V_real 2007f +%define V_subdir 2007f # package information Name: imap @@ -37,7 +37,7 @@ Group: Mail License: University of Washington's Free-Fork License Version: %{V_here} -Release: 20091030 +Release: 20120800 # package options %option with_ssl yes @@ -50,10 +50,8 @@ Patch0: imap.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc -PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc +PreReq: OpenPKG, openpkg >= 20100101 %if "%{with_pam}" == "yes" BuildPreReq: PAM PreReq: PAM @@ -62,8 +60,6 @@ BuildPreReq: openssl PreReq: openssl %endif -AutoReq: no -AutoReqProv: no %if "%{with_daemons}" == "yes" Conflicts: imaputils %endif @@ -82,6 +78,13 @@ %prep %setup -q -n imap-%{V_subdir} %patch -p0 + case "%{l_platform -t}" in + *-sunos* ) + %{l_shtool} subst \ + -e 's;dd_fd;d_fd;g' \ + src/osdep/unix/scandir.c + ;; + esac %build mflags="%{l_mflags}" @@ -123,7 +126,6 @@ EXTRALDFLAGS="$ldflags" %install - rm -rf $RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/include/imap \ $RPM_BUILD_ROOT%{l_prefix}/lib @@ -160,5 +162,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT