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/highlight] rawhide: use forge macros, modernize spec to qmake_qt macros
Date: Tue, 18 Aug 2026 22:04:56 GMT	[thread overview]
Message-ID: <178709069659.1.1145419837056371726.rpms-highlight-53d2b40d4045@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/highlight
Branch : rawhide
Commit : 53d2b40d40458f5e5f06072457e1a777cdbff8d0
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-08-15T20:58:06-03:00
Stats  : +17/-8 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/highlight/c/53d2b40d40458f5e5f06072457e1a777cdbff8d0?branch=rawhide

Log:
use forge macros, modernize spec to qmake_qt macros

---
diff --git a/highlight.spec b/highlight.spec
index c3797ab..158f49b 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,10 +1,13 @@
+%global forgeurl https://gitlab.com/saalen/highlight
+Version:        4.21
+%forgemeta
+
 Name:           highlight
 Summary:        Universal source code to formatted text converter
-Version:        4.21
 Release:        %autorelease
 License:        GPL-3.0-only
 URL:            http://www.andre-simon.de/
-Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+Source0:        %{forgesource}
 
 %bcond qt %[%{undefined rhel} || 0%{?rhel} < 10]
 
@@ -38,7 +41,14 @@ A Qt-based GUI for the highlight source code formatter source.
 %endif
 
 %prep
-%autosetup
+%forgeautosetup
+# Fix line endings of extra batch files to avoid rpmlint warnings
+find extras/ -type f -name "*.bat" -exec sed -i 's/\r$//' {} +
+find extras/ -type f -name "*.pb" -exec sed -i 's/\r$//' {} +
+
+# Fix duplicate UNLICENCE file by symlinking it relatively
+rm -f extras/themes-resources/css-themes/UNLICENCE
+ln -s ../../langDefs-resources/UNLICENCE extras/themes-resources/css-themes/UNLICENCE
 
 %build
 %set_build_flags
@@ -50,11 +60,10 @@ export CFLAGS="$CFLAGS $CXXFLAGS -fPIC"
     conf_dir="%{_sysconfdir}/"
 
 %if %{with qt}
-%make_build gui \
-    PREFIX="%{_prefix}" \
-    conf_dir="%{_sysconfdir}/" \
-    QMAKE="%{_qt6_qmake}" \
-    QMAKE_STRIP=
+cd src/gui-qt
+%qmake_qt6
+%make_build
+cd ../..
 %endif
 
 %install

                 reply	other threads:[~2026-08-18 22:04 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=178709069659.1.1145419837056371726.rpms-highlight-53d2b40d4045@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