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: 18-Jul-2006 08:37:42
Branch: HEAD Handle: 2006071807374200
Modified files:
openpkg-src/mutt mutt.spec
Log:
upgrade patches and include fix from 2.5
Summary:
Revision Changes Path
1.75 +11 -2 openpkg-src/mutt/mutt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mutt/mutt.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 mutt.spec
--- openpkg-src/mutt/mutt.spec 15 Jul 2006 16:31:21 -0000 1.74
+++ openpkg-src/mutt/mutt.spec 18 Jul 2006 06:37:42 -0000 1.75
@@ -26,7 +26,7 @@
# package version
%define V_mutt 1.5.12
-%define V_mutt_patches 1.5.11
+%define V_mutt_patches 1.5.12
%define V_mutt_patches_sidebar 1.5.11.sidebar.20060225
# package information
@@ -40,7 +40,7 @@
Group: Mail
License: BSD
Version: %{V_mutt}
-Release: 20060715
+Release: 20060718
# build options
%option with_comp no
@@ -130,6 +130,15 @@
-e '/^diff.*configure\.in /,/^diff/d' \
-e '/^diff.*acconfig\.h /,/^diff/d' |\
%{l_patch} -p1
+ # add target without requiring autoconf(1) to rebuild Makefile.in
+ # from Makefile.am since definitions of the patch are wrongly
+ # placed at the very beginning of Makefile.in and get overwritten
+ # latter.
+ %{l_shtool} subst -s \
+ -e 's;^\( \| \{8,\}\)\(crypt.c cryptglue.c .*\)$; compress.c \2;'
\
+ -e 's;^\( attach.h buffy.h charset.h \)\(copy.h
.*\)$;\1compress.h \2;' \
+ -e 's;^\( buffy.$(OBJEXT) color.$(OBJEXT)
\)\(.*\)$;\1compress.$(OBJEXT) \2;' \
+ Makefile.in
%endif
%if "%{with_nntp}" == "yes"
%{l_gzip} -d -c <%{PATCH1} |\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
