public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: raveit65 <mate@raveit.de>
To: git-commits@fedoraproject.org
Subject: [rpms/atril] epel8: fix spec file
Date: Thu, 11 Jun 2026 19:46:24 GMT [thread overview]
Message-ID: <178120718428.1.8273619379957402303.rpms-atril-cc2e302968f9@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/atril
Branch : epel8
Commit : cc2e302968f912852786356c098af1e00543135c
Author : raveit65 <mate@raveit.de>
Date : 2024-01-24T14:21:56+01:00
Stats : +0/-3 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/atril/c/cc2e302968f912852786356c098af1e00543135c?branch=epel8
Log:
fix spec file
---
diff --git a/atril.spec b/atril.spec
index 80c8fe4..58a9b8e 100644
--- a/atril.spec
+++ b/atril.spec
@@ -29,11 +29,8 @@ URL: http://mate-desktop.org
# Source for snapshot-builds.
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
-<<<<<<< HEAD
-=======
BuildRequires: cairo-gobject-devel
BuildRequires: desktop-file-utils
->>>>>>> 99cdfe7 (update to 1.26.2)
BuildRequires: gcc-c++
BuildRequires: gobject-introspection-devel
BuildRequires: gtk3-devel
reply other threads:[~2026-06-11 19:46 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=178120718428.1.8273619379957402303.rpms-atril-cc2e302968f9@fedoraproject.org \
--to=mate@raveit.de \
--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