Browse Source

upgrade patches and include fix from 2.5

Ralf S. Engelschall 19 years ago
parent
commit
4f6a4efdd7
1 changed files with 11 additions and 2 deletions
  1. 11 2
      mutt/mutt.spec

+ 11 - 2
mutt/mutt.spec

@@ -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 @@ Class:        BASE
 Group:        Mail
 License:      BSD
 Version:      %{V_mutt}
-Release:      20060715
+Release:      20060718
 
 #   build options
 %option       with_comp      no
@@ -130,6 +130,15 @@ AutoReqProv:  no
             -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} |\