Update version, modernize packaging, and correct flawed DIR dd_fd ref on SVR4.

Tue, 28 Aug 2012 18:33:10 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 18:33:10 +0200
changeset 555
434e5cc73d47
parent 554
9d786c9d3d15
child 556
d927b76d07e3

Update version, modernize packaging, and correct flawed DIR dd_fd ref on SVR4.

imap/imap.spec file | annotate | diff | comparison | revisions
     1.1 --- a/imap/imap.spec	Tue Aug 28 18:32:15 2012 +0200
     1.2 +++ b/imap/imap.spec	Tue Aug 28 18:33:10 2012 +0200
     1.3 @@ -22,9 +22,9 @@
     1.4  ##
     1.5  
     1.6  #   package version
     1.7 -%define       V_here   2007e
     1.8 -%define       V_real   2007e
     1.9 -%define       V_subdir 2007e
    1.10 +%define       V_here   2007f
    1.11 +%define       V_real   2007f
    1.12 +%define       V_subdir 2007f
    1.13  
    1.14  #   package information
    1.15  Name:         imap
    1.16 @@ -37,7 +37,7 @@
    1.17  Group:        Mail
    1.18  License:      University of Washington's Free-Fork License
    1.19  Version:      %{V_here}
    1.20 -Release:      20091030
    1.21 +Release:      20120800
    1.22  
    1.23  #   package options
    1.24  %option       with_ssl      yes
    1.25 @@ -50,10 +50,8 @@
    1.26  Patch0:       imap.patch
    1.27  
    1.28  #   build information
    1.29 -Prefix:       %{l_prefix}
    1.30 -BuildRoot:    %{l_buildroot}
    1.31 -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
    1.32 -PreReq:       OpenPKG, openpkg >= 20040130
    1.33 +BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc
    1.34 +PreReq:       OpenPKG, openpkg >= 20100101
    1.35  %if "%{with_pam}" == "yes"
    1.36  BuildPreReq:  PAM
    1.37  PreReq:       PAM
    1.38 @@ -62,8 +60,6 @@
    1.39  BuildPreReq:  openssl
    1.40  PreReq:       openssl
    1.41  %endif
    1.42 -AutoReq:      no
    1.43 -AutoReqProv:  no
    1.44  %if "%{with_daemons}" == "yes"
    1.45  Conflicts:    imaputils
    1.46  %endif
    1.47 @@ -82,6 +78,13 @@
    1.48  %prep
    1.49      %setup -q -n imap-%{V_subdir}
    1.50      %patch -p0
    1.51 +    case "%{l_platform -t}" in
    1.52 +        *-sunos* )
    1.53 +            %{l_shtool} subst \
    1.54 +                -e 's;dd_fd;d_fd;g' \
    1.55 +                src/osdep/unix/scandir.c
    1.56 +            ;;
    1.57 +    esac
    1.58  
    1.59  %build
    1.60      mflags="%{l_mflags}"
    1.61 @@ -123,7 +126,6 @@
    1.62          EXTRALDFLAGS="$ldflags"
    1.63  
    1.64  %install
    1.65 -    rm -rf $RPM_BUILD_ROOT
    1.66      %{l_shtool} mkdir -f -p -m 755 \
    1.67          $RPM_BUILD_ROOT%{l_prefix}/include/imap \
    1.68          $RPM_BUILD_ROOT%{l_prefix}/lib
    1.69 @@ -160,5 +162,4 @@
    1.70  %files -f files
    1.71  
    1.72  %clean
    1.73 -    rm -rf $RPM_BUILD_ROOT
    1.74  

mercurial