diff --git a/.gitignore b/.gitignore index 0a3b7bf..5ac5d60 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /aerc-c303b953360994966ff657c4e17670853198ecf7.tar.gz /aerc-f81d8871c7007c7fa17f3779f711631d747f22df.tar.gz /aerc-0.7.1.tar.gz +/aerc-0.10.0.tar.gz diff --git a/aerc-fix-makefile.patch b/aerc-fix-makefile.patch index 592ae10..0d7e355 100644 --- a/aerc-fix-makefile.patch +++ b/aerc-fix-makefile.patch @@ -1,19 +1,24 @@ -diff -up aerc-f81d8871c7007c7fa17f3779f711631d747f22df/Makefile.orig aerc-f81d8871c7007c7fa17f3779f711631d747f22df/Makefile ---- aerc-f81d8871c7007c7fa17f3779f711631d747f22df/Makefile.orig 2022-01-15 12:14:32.000000000 +0100 -+++ aerc-f81d8871c7007c7fa17f3779f711631d747f22df/Makefile 2022-01-21 12:54:37.525936280 +0100 -@@ -70,7 +70,7 @@ DOCS := \ +diff -up aerc-0.10.0/Makefile.orig aerc-0.10.0/Makefile +--- aerc-0.10.0/Makefile.orig 2022-05-08 18:36:49.000000000 +0200 ++++ aerc-0.10.0/Makefile 2022-05-10 19:44:33.330861580 +0200 +@@ -32,7 +32,7 @@ DOCS := \ + aerc-templates.7 \ + aerc-stylesets.7 - doc: $(DOCS) +-all: aerc $(DOCS) ++all: $(DOCS) --all: aerc aerc.conf doc -+all: aerc.conf doc + build_cmd:=$(GO) build $(GOFLAGS) -ldflags "$(GO_LDFLAGS)" -o aerc - # Exists in GNUMake but not in NetBSD make and others. - RM?=rm -f -@@ -81,27 +81,26 @@ clean: - install: all +@@ -83,36 +83,35 @@ RM?=rm -f + clean: + $(RM) $(DOCS) aerc + +-install: $(DOCS) aerc ++install: $(DOCS) mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \ - $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets + $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets \ + $(DESTDIR)$(PREFIX)/share/applications - install -m755 aerc $(DESTDIR)$(BINDIR)/aerc - install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1 - install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1 @@ -27,14 +32,8 @@ diff -up aerc-f81d8871c7007c7fa17f3779f711631d747f22df/Makefile.orig aerc-f81d88 - install -m644 aerc-templates.7 $(DESTDIR)$(MANDIR)/man7/aerc-templates.7 - install -m644 aerc-stylesets.7 $(DESTDIR)$(MANDIR)/man7/aerc-stylesets.7 - install -m644 config/accounts.conf $(DESTDIR)$(SHAREDIR)/accounts.conf -- install -m644 aerc.conf $(DESTDIR)$(SHAREDIR)/aerc.conf +- install -m644 config/aerc.conf $(DESTDIR)$(SHAREDIR)/aerc.conf - install -m644 config/binds.conf $(DESTDIR)$(SHAREDIR)/binds.conf -- install -m755 filters/hldiff $(DESTDIR)$(SHAREDIR)/filters/hldiff -- install -m755 filters/html $(DESTDIR)$(SHAREDIR)/filters/html -- install -m755 filters/plaintext $(DESTDIR)$(SHAREDIR)/filters/plaintext -- install -m644 templates/quoted_reply $(DESTDIR)$(SHAREDIR)/templates/quoted_reply -- install -m644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body -- install -m644 config/default_styleset $(DESTDIR)$(SHAREDIR)/stylesets/default + install -pm644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1 + install -pm644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1 + install -pm644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5 @@ -47,14 +46,25 @@ diff -up aerc-f81d8871c7007c7fa17f3779f711631d747f22df/Makefile.orig aerc-f81d88 + install -pm644 aerc-templates.7 $(DESTDIR)$(MANDIR)/man7/aerc-templates.7 + install -pm644 aerc-stylesets.7 $(DESTDIR)$(MANDIR)/man7/aerc-stylesets.7 + install -pm644 config/accounts.conf $(DESTDIR)$(SHAREDIR)/accounts.conf -+ install -pm644 aerc.conf $(DESTDIR)$(SHAREDIR)/aerc.conf ++ install -pm644 config/aerc.conf $(DESTDIR)$(SHAREDIR)/aerc.conf + install -pm644 config/binds.conf $(DESTDIR)$(SHAREDIR)/binds.conf -+ install -pm755 filters/hldiff $(DESTDIR)$(SHAREDIR)/filters/hldiff -+ install -pm755 filters/html $(DESTDIR)$(SHAREDIR)/filters/html -+ install -pm755 filters/plaintext $(DESTDIR)$(SHAREDIR)/filters/plaintext + install -m755 filters/colorize $(DESTDIR)$(SHAREDIR)/filters/colorize + install -m755 filters/hldiff $(DESTDIR)$(SHAREDIR)/filters/hldiff + install -m755 filters/html $(DESTDIR)$(SHAREDIR)/filters/html + install -m755 filters/html-unsafe $(DESTDIR)$(SHAREDIR)/filters/html-unsafe + install -m755 filters/plaintext $(DESTDIR)$(SHAREDIR)/filters/plaintext +- install -m755 filters/show-ics-details.py $(DESTDIR)$(SHAREDIR)/filters/show-ics-details.py +- install -m644 templates/new_message $(DESTDIR)$(SHAREDIR)/templates/new_message +- install -m644 templates/quoted_reply $(DESTDIR)$(SHAREDIR)/templates/quoted_reply +- install -m644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body +- install -m644 config/default_styleset $(DESTDIR)$(SHAREDIR)/stylesets/default +- install -m644 contrib/aerc.desktop $(DESTDIR)$(PREFIX)/share/applications/aerc.desktop ++ install -pm755 filters/show-ics-details.py $(DESTDIR)$(SHAREDIR)/filters/show-ics-details.py ++ install -pm644 templates/new_message $(DESTDIR)$(SHAREDIR)/templates/new_message + install -pm644 templates/quoted_reply $(DESTDIR)$(SHAREDIR)/templates/quoted_reply + install -pm644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body + install -pm644 config/default_styleset $(DESTDIR)$(SHAREDIR)/stylesets/default ++ install -pm644 contrib/aerc.desktop $(DESTDIR)$(PREFIX)/share/applications/aerc.desktop - RMDIR_IF_EMPTY:=sh -c '\ - if test -d $$0 && ! ls -1qA $$0 | grep -q . ; then \ + .PHONY: checkinstall + checkinstall: diff --git a/aerc.spec b/aerc.spec index 04c24f6..098fa25 100644 --- a/aerc.spec +++ b/aerc.spec @@ -4,8 +4,8 @@ # https://git.sr.ht/~rjarry/aerc %global goipath git.sr.ht/~rjarry/aerc %global forgeurl https://git.sr.ht/~rjarry/aerc -Version: 0.7.1 -%global tag 0.7.1 +Version: 0.10.0 +%global tag 0.10.0 %global repo aerc %global archivename %{repo}-%{tag} %global archiveext tar.gz @@ -34,6 +34,8 @@ Source0: %{gosource} Patch0: aerc-fix-makefile.patch BuildRequires: scdoc +BuildRequires: desktop-file-utils +BuildRequires: gnupg BuildRequires: golang(git.sr.ht/~sircmpwn/getopt) BuildRequires: golang(github.com/creack/pty) BuildRequires: golang(github.com/danwakefield/fnmatch) @@ -50,21 +52,24 @@ BuildRequires: golang(github.com/emersion/go-pgpmail) BuildRequires: golang(github.com/emersion/go-sasl) BuildRequires: golang(github.com/emersion/go-smtp) BuildRequires: golang(github.com/fsnotify/fsnotify) +BuildRequires: golang(github.com/gatherstars-com/jwz) BuildRequires: golang(github.com/gdamore/tcell/v2) BuildRequires: golang(github.com/gdamore/tcell/v2/views) BuildRequires: golang(github.com/go-ini/ini) BuildRequires: golang(github.com/google/shlex) BuildRequires: golang(github.com/imdario/mergo) BuildRequires: golang(github.com/kyoh86/xdg) +BuildRequires: golang(github.com/lithammer/fuzzysearch/fuzzy) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/mattn/go-runewidth) BuildRequires: golang(github.com/miolini/datacounter) BuildRequires: golang(github.com/mitchellh/go-homedir) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/ProtonMail/go-crypto/openpgp) -BuildRequires: golang(github.com/ProtonMail/go-crypto/openpgp/errors) +BuildRequires: golang(github.com/ProtonMail/go-crypto/openpgp/armor) BuildRequires: golang(github.com/ProtonMail/go-crypto/openpgp/packet) BuildRequires: golang(github.com/riywo/loginshell) +BuildRequires: golang(github.com/xo/terminfo) BuildRequires: golang(golang.org/x/oauth2) Requires: notmuch @@ -93,6 +98,9 @@ install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ export PREFIX=%{_prefix} %make_install +desktop-file-validate %{buildroot}/%{_datadir}/applications/aerc.desktop + + %if %{with check} %check @@ -108,6 +116,7 @@ export PREFIX=%{_prefix} %{_mandir}/man5/%{name}-*.5.* %{_mandir}/man7/%{name}-*.7.* %{_datadir}/aerc +%{_datadir}/applications/aerc.desktop %changelog %autochangelog diff --git a/sources b/sources index b4fcc66..7d34ee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aerc-0.7.1.tar.gz) = 34ddc3d3e10e66f8341b985f9d654b05f48dd56fe403bbd5327a514a89f8bc2c1ec81c82ddc508a1289267eafda8f4d54770f17767e1c74b6195e468d19e3088 +SHA512 (aerc-0.10.0.tar.gz) = 016182847e1fb8198973aa8522d9a205a8589760d40b0177cb41a9b236277fb4aa11d2c0f14bd836be5a53f4b4d5ef65b407407e09399a2ad025fbf22d53bfbb