Browse Source

upgrading mutt upstream version from 1.3.28i to 1.3.99i

Ralf S. Engelschall 24 years ago
parent
commit
c846efa753
1 changed files with 6 additions and 6 deletions
  1. 6 6
      mutt/mutt.spec

+ 6 - 6
mutt/mutt.spec

@@ -24,7 +24,7 @@
 ##  
 
 #   version
-%define       V_mutt      1.3.28
+%define       V_mutt      1.3.99
 
 #   build options
 %ifndef       with_comp
@@ -44,7 +44,7 @@ Distribution: OpenPKG [REL]
 Group:        Mail
 License:      BSD
 Version:      %{V_mutt}i
-Release:      20020320
+Release:      20020519
 
 #   list of sources
 Source0:      ftp://ftp.mutt.org/pub/mutt/mutt-%{V_mutt}i.tar.gz
@@ -56,7 +56,7 @@ Patch1:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020222, make, openssl, slang, libiconv
+BuildPreReq:  OpenPKG, openpkg >= 20020222, make, openssl, slang
 PreReq:       OpenPKG, openpkg >= 20020222
 AutoReq:      no
 AutoReqProv:  no
@@ -82,16 +82,17 @@ AutoReqProv:  no
     esac
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
+    CPPFLAGS="-DICONV_CONST=const" \
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/mutt \
         --with-docdir=%{l_prefix}/share/mutt \
         --with-slang=%{l_prefix} \
-        --with-iconv=%{l_prefix} \
         --with-ssl=%{l_prefix} \
-        --without-wc-funcs \
         --enable-pop \
         --enable-imap \
+        --without-iconv \
+        --without-wc-funcs \
         --disable-nls \
 %if "%{with_comp}" == "yes"
         --enable-compressed \
@@ -113,7 +114,6 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/flea.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/muttbug
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/muttbug.1
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/pgp*
     %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE muttrc} $RPM_BUILD_ROOT%{l_prefix}/etc/mutt/Muttrc
     %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \