OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Sep-2005 10:19:53
Branch: HEAD Handle: 2005093009195300
Modified files:
openpkg-src/mutt mutt.spec
Removed files:
openpkg-src/mutt mutt.patch
Log:
Upgrade from Mutt 1.4 to Mutt 1.5
Summary:
Revision Changes Path
1.4 +0 -12 openpkg-src/mutt/mutt.patch
1.67 +35 -29 openpkg-src/mutt/mutt.spec
____________________________________________________________________________
rm -f openpkg-src/mutt/mutt.patch <<'@@ .'
Index: openpkg-src/mutt/mutt.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mutt/mutt.spec
============================================================================
$ cvs diff -u -r1.66 -r1.67 mutt.spec
--- openpkg-src/mutt/mutt.spec 23 Sep 2005 09:23:37 -0000 1.66
+++ openpkg-src/mutt/mutt.spec 30 Sep 2005 08:19:53 -0000 1.67
@@ -23,7 +23,9 @@
##
# package version
-%define V_mutt 1.4.2.1
+%define V_mutt 1.5.11
+%define V_mutt_patches 1.5.11
+%define V_mutt_patches_sidebar 1.5.10i.sidebar.20050816
# package information
Name: mutt
@@ -36,32 +38,33 @@
Group: Mail
License: BSD
Version: %{V_mutt}i
-Release: 20050923
+Release: 20050930
# build options
%option with_comp no
%option with_nntp no
%option with_initials no
%option with_quote no
+%option with_sidebar no
%option with_ncurses no
# list of sources
-Source0: ftp://ftp.mutt.org/mutt/mutt-%{V_mutt}i.tar.gz
+Source0: ftp://ftp.mutt.org/mutt/devel/mutt-%{V_mutt}.tar.gz
Source1: mailcap
Source2: muttrc
-Patch0:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.rr.compressed.gz
-Patch1:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.nntp.gz
-Patch2:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.initials.gz
-Patch3:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.quote.gz
-Patch4: mutt.patch
+Patch0:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mutt_patches}.rr.compressed.gz
+Patch1:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mutt_patches}.vvv.nntp.gz
+Patch2:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mutt_patches}.vvv.initials.gz
+Patch3:
ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mutt_patches}.vvv.quote.gz
+Patch4: http://thomer.com/mutt/patch-%{V_mutt_patches_sidebar}.txt
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: openssl
-PreReq: openssl
+BuildPreReq: openssl, libidn, libiconv
+PreReq: openssl, libidn, libiconv
%if "%{with_ncurses}" == "yes"
BuildPreReq: ncurses
PreReq: ncurses
@@ -71,7 +74,6 @@
%endif
AutoReq: no
AutoReqProv: no
-Conflicts: mutt15
%description
Mutt is a small but very powerful text based program for reading
@@ -80,38 +82,43 @@
%track
prog mutt = {
- version = %{version}
- url = ftp://ftp.mutt.org/mutt/
- regex = mutt-(__VER__i)\.tar\.gz
+ version = %{V_mutt}
+ url = ftp://ftp.mutt.org/mutt/devel/
+ regex = mutt-(__VER__)\.tar\.gz
}
prog mutt:patch_rr_compressed = {
- version = %{V_mutt}
+ version = %{V_mutt_patches}
url = ftp://ftp.mutt.org.ua/pub/mutt/
- regex = mutt-(1\.4(\.\d+)+)
+ regex = mutt-(1\.5(\.\d+)+)
url = ftp://ftp.mutt.org.ua/pub/mutt/mutt-__NEWVER__/
regex = patch-(__VER__)\.rr\.compressed\.gz
}
prog mutt:patch_vvv_initials = {
- version = %{V_mutt}
+ version = %{V_mutt_patches}
url = ftp://ftp.mutt.org.ua/pub/mutt/
- regex = mutt-(1\.4(\.\d+)+)
+ regex = mutt-(1\.5(\.\d+)+)
url = ftp://ftp.mutt.org.ua/pub/mutt/mutt-__NEWVER__/
regex = patch-(__VER__)\.vvv\.initials\.gz
}
prog mutt:patch_vvv_nntp = {
- version = %{V_mutt}
+ version = %{V_mutt_patches}
url = ftp://ftp.mutt.org.ua/pub/mutt/
- regex = mutt-(1\.4(\.\d+)+)
+ regex = mutt-(1\.5(\.\d+)+)
url = ftp://ftp.mutt.org.ua/pub/mutt/mutt-__NEWVER__/
regex = patch-(__VER__)\.vvv\.nntp\.gz
}
prog mutt:patch_vvv_quote = {
- version = %{V_mutt}
+ version = %{V_mutt_patches}
url = ftp://ftp.mutt.org.ua/pub/mutt/
- regex = mutt-(1\.4(\.\d+)+)
+ regex = mutt-(1\.5(\.\d+)+)
url = ftp://ftp.mutt.org.ua/pub/mutt/mutt-__NEWVER__/
regex = patch-(__VER__)\.vvv\.quote\.gz
}
+ prog mutt:patch_sidebar = {
+ version = %{V_mutt_patches_sidebar}
+ url = http://thomer.com/mutt/
+ regex = patch-(.+?i.sidebar.__VER__)\.txt
+ }
%prep
%setup -q -n mutt-%{V_mutt}
@@ -134,15 +141,15 @@
%if "%{with_quote}" == "yes"
%patch -p1 -P 3
%endif
+%if "%{with_sidebar}" == "yes"
+ %patch -p1 -P 4
+%endif
%{l_shtool} subst \
-e 's;\(Mutt/%%s\);\1 %{l_openpkg_release -F "OpenPKG/%%s"};' \
sendlib.c
- %patch -p0 -P 4
%build
# configure for particular platform
- echo 'am_cv_func_iconv=no' >config.cache
- echo 'ac_cv_header_iconv_h=no' >>config.cache
options=''
case "%{l_platform -t}" in
*-freebsd* ) options="--enable-flock --disable-fcntl" ;;
@@ -150,13 +157,12 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
%if "%{with_ncurses}" == "yes"
- CPPFLAGS="%{l_cppflags ncurses .}" \
+ CPPFLAGS="%{l_cppflags ncurses libidn .}" \
%else
- CPPFLAGS="%{l_cppflags}" \
+ CPPFLAGS="%{l_cppflags libidn .}" \
%endif
LDFLAGS="-Limap %{l_ldflags}" \
./configure \
- --cache-file=./config.cache \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/mutt \
--with-docdir=%{l_prefix}/share/mutt \
@@ -176,7 +182,7 @@
%endif
--enable-buffy-size \
--disable-warnings \
- --disable-iconv \
+ --with-iconv \
--disable-nls \
$options
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
