start upgrade to 1.6.0

- commented out pl.po and fast_trash patches
- dropped Makefile.in diff from sidebar (regenerated by autotools)
- rel 0.1

diff --git a/mutt-cd.purge_message.patch b/mutt-cd.purge_message.patch
index 9d290b9a61f66aca381880b909a9a65dda95e395..9d20e359880dcdbbe75fe4041c1af67888816aa2 100644 (file)
--- a/mutt-cd.purge_message.patch
+++ b/mutt-cd.purge_message.patch
@@ -158,7 +158,7 @@ of having a trash folder feature.
            mx_close_mailbox (ctx_trash, NULL);
 --- a/pager.c
 +++ b/pager.c
            mx_close_mailbox (ctx_trash, NULL);
 --- a/pager.c
 +++ b/pager.c

-@@ -2343,12 +2343,15 @@
+@@ -2351,6 +2351,7 @@

        MAYBE_REDRAW (redraw);
        break;
  
        MAYBE_REDRAW (redraw);
        break;
  


@@ -166,7 +166,8 @@ of having a trash folder feature.
        case OP_DELETE:
        CHECK_MODE(IsHeader (extra));
        CHECK_READONLY;
        case OP_DELETE:
        CHECK_MODE(IsHeader (extra));
        CHECK_READONLY;

-       CHECK_ACL(M_ACL_DELETE, _("delete message"));
+@@ -2358,6 +2359,8 @@
+       CHECK_ACL(M_ACL_DELETE, _("Cannot delete message"));

  
        mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
 +      mutt_set_flag (Context, extra->hdr, M_PURGED,
  
        mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
 +      mutt_set_flag (Context, extra->hdr, M_PURGED,

diff --git a/mutt-sidebar.patch b/mutt-sidebar.patch
index ff5435e757da1ab47929ddae191e2136bb2db429..0b02d91e563eb01c5612f37eab0cf5ddad828b2d 100644 (file)
--- a/mutt-sidebar.patch
+++ b/mutt-sidebar.patch
@@ -1002,79 +1002,12 @@
 *** 33,38 ****
 --- 33,39 ----
        rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
 *** 33,38 ****
 --- 33,39 ----
        rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \

-       score.c send.c sendlib.c signal.c sort.c \
+       score.c send.c sendlib.c signal.c signature.c sort.c \

        status.c system.c thread.c charset.c history.c lib.c \
 +      sidebar.c \
        status.c system.c thread.c charset.c history.c lib.c \
 +      sidebar.c \

-       muttlib.c editmsg.c mbyte.c \
+       muttlib.c editmsg.c mbyte.c mutt_idna.c \

        url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
   
        url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
   

-*** mutt-1.5.24-orig/Makefile.in       2015-08-30 12:24:26.000000000 -0500
---- mutt-1.5.24/Makefile.in    2015-09-16 23:18:13.000000000 -0500
-***************
-*** 83,92 ****
-       $(srcdir)/Makefile.am $(top_srcdir)/configure \
-       $(am__configure_deps) $(srcdir)/config.h.in \
-       $(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
-!      $(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \
-!      snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \
-!      strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \
-!      README TODO compile config.guess config.sub install-sh missing
-  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-       pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
-  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
---- 83,92 ----
-       $(srcdir)/Makefile.am $(top_srcdir)/configure \
-       $(am__configure_deps) $(srcdir)/config.h.in \
-       $(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
-!      $(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \
-!      strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \
-!      strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \
-!      compile config.guess config.sub install-sh missing
-  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-       pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
-  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
-***************
-*** 128,136 ****
-       score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
-       signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-       system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-!      history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
-!      editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
-!      ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-       $(am__objects_1)
---- 128,137 ----
-       score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
-       signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-       system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-!      history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \
-!      muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \
-!      url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
-!      safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-       $(am__objects_1)
-***************
-*** 474,479 ****
---- 475,481 ----
-       rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
-       score.c send.c sendlib.c signal.c sort.c \
-       status.c system.c thread.c charset.c history.c lib.c \
-+      sidebar.c \
-       muttlib.c editmsg.c mbyte.c \
-       url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
-  
-***************
-*** 804,809 ****
---- 806,812 ----
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
-+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@

 *** mutt-1.5.24-orig/mbox.c    2015-08-30 12:06:38.000000000 -0500
 --- mutt-1.5.24/mbox.c 2015-09-16 23:18:13.000000000 -0500
 ***************
 *** mutt-1.5.24-orig/mbox.c    2015-08-30 12:06:38.000000000 -0500
 --- mutt-1.5.24/mbox.c 2015-09-16 23:18:13.000000000 -0500
 ***************

diff --git a/mutt.spec b/mutt.spec
index 49fe156b7496b4c0506d3226a1a072f9e2f103df..2bf92a55ea2f0cfdcba0bfadb788290ab3c46b36 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,14 +28,14 @@ Summary(ru.UTF-8):  Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt

-Version:       1.5.24
-Release:       2
+Version:       1.6.0
+Release:       0.1

 Epoch:         6
 License:       GPL v2+
 Group:         Applications/Mail
 # temporarily dead? (Jun 2014)
 Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
 Epoch:         6
 License:       GPL v2+
 Group:         Applications/Mail
 # temporarily dead? (Jun 2014)
 Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz

-# Source0-md5: 7f25d27f3c7c82285ac07aac35f5f0f2
+# Source0-md5: d05bb821d7040c61ba89b22d7c2bd388

 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl


@@ -152,7 +152,7 @@ Mutt - це невеликий, але потужний повноекранни
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
+#%%patch0 -p1

 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1


@@ -174,7 +174,7 @@ Mutt - це невеликий, але потужний повноекранни
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1

-%patch22 -p1
+#%%patch22 -p1

 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1
 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1