public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ansifilter] epel8: spec cleanup and modernization, silent rpmlint
Date: Fri, 21 Aug 2026 14:11:24 GMT [thread overview]
Message-ID: <178732148453.1.4932926668443428075.rpms-ansifilter-da8fdcf529d8@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ansifilter
Branch : epel8
Commit : da8fdcf529d841b933ca84d08780693e9f29fc47
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date : 2026-03-14T22:15:31+00:00
Stats : +23/-23 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ansifilter/c/da8fdcf529d841b933ca84d08780693e9f29fc47?branch=epel8
Log:
spec cleanup and modernization, silent rpmlint
---
diff --git a/ansifilter.spec b/ansifilter.spec
index 0682e33..b07fecd 100644
--- a/ansifilter.spec
+++ b/ansifilter.spec
@@ -1,4 +1,3 @@
-%global debug_package %{nil}
%bcond_without gui
# Fedora has Qt6
# EPEL9+ has Qt6, but RHEL9 and CentOS Stream 9 do not, while their 10 versions do
@@ -14,16 +13,18 @@ Name: ansifilter
Version: 2.22
Release: %autorelease
Summary: ANSI terminal escape code converter
-# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
URL: http://www.andre-simon.de/doku/ansifilter/ansifilter.php
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-BuildRequires: gcc-c++
%if %{with gui}
Source1: ansifilter.desktop
Source2: http://www.andre-simon.de/img/af_icon.png
%endif
+BuildRequires: gcc-c++
+BuildRequires: make
+BuildRequires: desktop-file-utils
+
%description
Ansifilter handles text files containing ANSI terminal escape codes. The
command sequences may be stripped or be interpreted to generate formatted
@@ -31,10 +32,8 @@ output (HTML, RTF, TeX, LaTeX, BBCode).
%if %{with gui}
%package gui
-Summary: GUI for %{name} based on Qt5
-BuildRequires: desktop-file-utils
+Summary: GUI for %{name} based on Qt%{qt_ver}
BuildRequires: qt%{qt_ver}-qtbase-devel
-BuildRequires: make
%description gui
Ansifilter handles text files containing ANSI terminal escape codes. The
@@ -47,42 +46,43 @@ This is a GUI of %{name} based on Qt%{qt_ver}.
%prep
%autosetup
-# Preserve timestamps.
-sed -i 's|install -m|install -pm|g' makefile
-
-%if %{with gui}
-# Remove pre-configured files which may cause errors during building.
-rm -frv src/qt-gui/moc_*.cpp
-rm -frv src/qt-gui/Makefile*
-%endif
-
# CRLF quickfix
-find . -type f -exec sed -i 's/\r$//' {} + -print
+find . -type f -exec sed -i 's/\r$//' {} +
%build
# Upstream embeds the cli code in gui so no need to require cli to use GUI
# program, in order to achieve this we need to preserve the objects with -c.
-%make_build CFLAGS+="%{optflags} -c" LDFLAGS="%{?__global_ldflags}"
+%make_build CXXFLAGS+="%{optflags}" LDFLAGS="%{?__global_ldflags}"
%if %{with gui}
# %%_qt5/6_qmake will respect the redhat-rpm-config
-%make_build all-gui QMAKE="%{qmake}"
+pushd src/qt-gui
+%{qmake} ansifilter-gui.pro \
+ "QMAKE_CXXFLAGS+=%{optflags}" \
+ "QMAKE_LFLAGS+=%{?__global_ldflags}"
+%make_build
+popd
%endif
%install
-%make_install
+%make_install \
+ INSTALL_DATA="install -p -m644" \
+ INSTALL_PROGRAM="install -p -m755"
%if %{with gui}
-make install-gui DESTDIR=%{buildroot}
+%make_install install-gui \
+ INSTALL_DATA="install -p -m644" \
+ INSTALL_PROGRAM="install -p -m755" \
+ DESTDIR=%{buildroot}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1}
install -pDm644 %{S:2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%endif
# Use %%doc and %%license to handle docs.
-rm -frv %{buildroot}%{_docdir}
+rm -rf %{buildroot}%{_docdir}/ansifilter
%files
-%doc ChangeLog* README*
+%doc ChangeLog.adoc README.adoc
%license COPYING
%{_bindir}/ansifilter
%{_mandir}/man1/ansifilter.1*
@@ -92,7 +92,7 @@ rm -frv %{buildroot}%{_docdir}
%if %{with gui}
%files gui
-%doc ChangeLog* README*
+%doc ChangeLog.adoc README.adoc
%license COPYING
%{_bindir}/ansifilter-gui
%{_datadir}/applications/%{name}.desktop
reply other threads:[~2026-08-21 14:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178732148453.1.4932926668443428075.rpms-ansifilter-da8fdcf529d8@fedoraproject.org \
--to=rosset.filipe@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox