public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/kf5-kfilemetadata] epel9-next: Merge branch 'f34' into epel8-next
Date: Mon, 20 Jul 2026 17:57:20 GMT	[thread overview]
Message-ID: <178457024077.1.6435734399950430298.rpms-kf5-kfilemetadata-5e85acf3737c@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/kf5-kfilemetadata
Branch : epel9-next
Commit : 5e85acf3737c6f5f93644b481c969a5b7c502f3f
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2021-09-14T08:38:25-07:00
Stats  : +15/-6 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/kf5-kfilemetadata/c/5e85acf3737c6f5f93644b481c969a5b7c502f3f?branch=epel9-next

Log:
Merge branch 'f34' into epel8-next

---
diff --git a/.gitignore b/.gitignore
index 6672aa0..2f0fdbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /kfilemetadata-5.81.0.tar.xz
 /kfilemetadata-5.82.0.tar.xz
 /kfilemetadata-5.83.0.tar.xz
+/kfilemetadata-5.85.0.tar.xz

diff --git a/kf5-kfilemetadata.spec b/kf5-kfilemetadata.spec
index 10ec335..d8e5bd3 100644
--- a/kf5-kfilemetadata.spec
+++ b/kf5-kfilemetadata.spec
@@ -18,8 +18,8 @@
 
 Name:           kf5-%{framework}
 Summary:        A Tier 2 KDE Framework for extracting file metadata
-Version: 5.83.0
-Release: 1%{?dist}.1
+Version: 5.85.0
+Release: 1%{?dist}
 
 # # KDE e.V. may determine that future LGPL versions are accepted
 License:        LGPLv2 or LGPLv3
@@ -120,8 +120,11 @@ mkdir -p %{buildroot}%{_kf5_plugindir}/kfilemetadata/writers/
 
 
 %changelog
-* Fri Jun 18 2021 Troy Dawson <tdawson@redhat.com> - 5.83.0-1.1
-- no catdoc or ebook for rhel
+* Thu Aug 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.85.0-1
+- 5.85.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.83.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jun 08 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.83.0-1
 - 5.83.0

diff --git a/sources b/sources
index 6b9f786..4339c4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kfilemetadata-5.83.0.tar.xz) = 257d4db283f8708f134c69ed835953c7b8177f18d2f8b8d682b0b51250802fbeee43d1603c3e302fb7c62e384d29ba69f6652807244a344d16fbafd50a535ff1
+SHA512 (kfilemetadata-5.85.0.tar.xz) = f531a1519ee3efc8b6973bf979ce2ee1380c9b425f06233267d007c1b79f6b7c2166e47212093ec8250f75dc9897dbb0d9b8b17ee4d999c487f10451a725ffd7

diff --git a/kf5-kfilemetadata.spec b/kf5-kfilemetadata.spec
index 4a491cf..d8e5bd3 100644
--- a/kf5-kfilemetadata.spec
+++ b/kf5-kfilemetadata.spec
@@ -4,13 +4,18 @@
 # Define to 1 to enable ffmpeg extractor
 #global         ffmpeg 1
 
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora}
 %global         catdoc 1
 %global         ebook 1
 %global         poppler 1
 %global         taglib 1
 %endif
 
+%if 0%{?rhel}
+%global         poppler 1
+%global         taglib 1
+%endif
+
 Name:           kf5-%{framework}
 Summary:        A Tier 2 KDE Framework for extracting file metadata
 Version: 5.85.0

             reply	other threads:[~2026-07-20 17:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-20 17:57 Troy Dawson [this message]
2026-07-20 17:57 [rpms/kf5-kfilemetadata] epel9-next: Merge branch f34 into epel8-next Troy Dawson

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=178457024077.1.6435734399950430298.rpms-kf5-kfilemetadata-5e85acf3737c@fedoraproject.org \
    --to=tdawson@redhat.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