OpenPKG Specs / changeset

     1.1 --- a/dovecot/dovecot.spec	Tue Apr 07 19:53:11 2009 +0200
     1.2 +++ b/dovecot/dovecot.spec	Wed Apr 08 22:32:04 2009 +0200
     1.3 @@ -170,6 +170,7 @@
     1.4          --datadir=%{l_prefix}/share/dovecot \
     1.5          --docdir=%{l_prefix}/share/dovecot/doc \
     1.6          --with-rundir=%{l_prefix}/var/dovecot/run \
     1.7 +        --with-statedir=%{l_prefix}/var/dovecot/dat \
     1.8          --with-libiconv-prefix=%{l_prefix} \
     1.9          --with-ssl=openssl \
    1.10          --with-deliver \
    1.11 @@ -250,7 +251,7 @@
    1.12  
    1.13      #   adjust file names of configuration files
    1.14      ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot
    1.15 -      for i in dovecot dovecot-ldap dovecot-sql; do
    1.16 +      for i in dovecot dovecot-db dovecot-ldap dovecot-sql; do
    1.17            mv ${i}{-example,}.conf
    1.18        done
    1.19      ) || exit $?
    1.20 @@ -258,10 +259,11 @@
    1.21      #   create additional dirctories
    1.22      %{l_shtool} mkdir -f -p -m 755 \
    1.23          $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ssl \
    1.24 +        $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/dat \
    1.25          $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/log \
    1.26          $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/run/login
    1.27  
    1.28 -    #   install run-command script
    1.29 +    #   install runcommand script
    1.30      %{l_shtool} mkdir -f -p -m 755 \
    1.31          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
    1.32  %if "%{with_pop3d}" == "yes"
    1.33 @@ -283,6 +285,9 @@
    1.34      #   strip installation
    1.35      rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \
    1.36          >/dev/null 2>&1 || true
    1.37 +    rmdir $RPM_BUILD_ROOT%{l_prefix}/include/dovecot \
    1.38 +        $RPM_BUILD_ROOT%{l_prefix}/include \
    1.39 +        >/dev/null 2>&1 || true
    1.40      strip \
    1.41          $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
    1.42          $RPM_BUILD_ROOT%{l_prefix}/libexec/dovecot/* \
    1.43 @@ -296,9 +301,10 @@
    1.44          '%config %attr(0640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \
    1.45          '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/dovecot/ssl' \
    1.46          '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \
    1.47 +        '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/dat' \
    1.48          '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \
    1.49 -        '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \
    1.50 -        '%dir %attr(0750,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run/login' \
    1.51 +        '%dir %attr(0755,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \
    1.52 +        '%dir %attr(0750,%{l_susr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \
    1.53          '%doc %{l_prefix}/share/dovecot/doc' \
    1.54          '%doc %{l_prefix}/share/dovecot/doc/wiki'
    1.55  
    1.56 @@ -319,6 +325,7 @@
    1.57      [ $1 -eq 0 ] || exit 0
    1.58      %{l_rc} dovecot stop 2>/dev/null
    1.59      rm -f $RPM_INSTALL_PREFIX/var/dovecot/*           >/dev/null 2>&1 || true
    1.60 +    rm -f $RPM_INSTALL_PREFIX/var/dovecot/dat/*       >/dev/null 2>&1 || true
    1.61      rm -f $RPM_INSTALL_PREFIX/var/dovecot/log/*       >/dev/null 2>&1 || true
    1.62      rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/*       >/dev/null 2>&1 || true
    1.63      rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/login/* >/dev/null 2>&1 || true