public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@math.unl.edu>
To: git-commits@fedoraproject.org
Subject: [rpms/ktouch] epel10: Merge branch 'f20'
Date: Tue, 04 Aug 2026 19:53:19 GMT [thread overview]
Message-ID: <178587319922.1.4820565716084764023.rpms-ktouch-6f1935b39519@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ktouch
Branch : epel10
Commit : 6f1935b39519877922ffd0bf4ddaa46138535cca
Author : Rex Dieter <rdieter@math.unl.edu>
Date : 2014-08-08T11:38:26-05:00
Stats : +15/-4 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/ktouch/c/6f1935b39519877922ffd0bf4ddaa46138535cca?branch=epel10
Log:
Merge branch 'f20'
Conflicts:
ktouch.spec
---
diff --git a/ktouch.spec b/ktouch.spec
index 0bb1ab5..18689b0 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -1,7 +1,7 @@
Name: ktouch
Summary: Touch Typing Tutor
Version: 4.13.97
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://projects.kde.org/projects/kde/kdeedu/%{name}
@@ -18,6 +18,7 @@ BuildRequires: desktop-file-utils
BuildRequires: kdelibs4-devel >= %{version}
Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: kqtquickcharts%{?_isa} >= %{version}
# when split occurred
Conflicts: kdeedu < 4.7.0-10
@@ -74,6 +75,9 @@ fi
%changelog
+* Fri Aug 08 2014 Rex Dieter <rdieter@fedoraproject.org> 4.13.97-2
+- Requires: kqtquickcharts (#1125461)
+
* Tue Aug 05 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.97-1
- 4.13.97
diff --git a/.gitignore b/.gitignore
index b2a3709..7f67711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/ktouch-4.13.1.tar.xz
/ktouch-4.13.2.tar.xz
/ktouch-4.13.3.tar.xz
+/ktouch-4.13.97.tar.xz
diff --git a/ktouch.spec b/ktouch.spec
index b733179..18689b0 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -1,6 +1,6 @@
Name: ktouch
Summary: Touch Typing Tutor
-Version: 4.13.3
+Version: 4.13.97
Release: 2%{?dist}
License: GPLv2+
@@ -13,6 +13,7 @@ URL: https://projects.kde.org/projects/kde/kdeedu/%{name}
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+BuildRequires: appdata-tools
BuildRequires: desktop-file-utils
BuildRequires: kdelibs4-devel >= %{version}
@@ -46,6 +47,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%check
+appdata-validate --nonet --relax %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
@@ -65,6 +67,7 @@ fi
%doc AUTHORS COPYING
%{_kde4_bindir}/ktouch
%{_kde4_appsdir}/ktouch/
+%{_kde4_datadir}/appdata/%{name}.appdata.xml
%{_kde4_datadir}/applications/kde4/ktouch.desktop
%{_kde4_datadir}/config.kcfg/ktouch.kcfg
%{_kde4_iconsdir}/hicolor/*/*/ktouch.*
@@ -72,9 +75,12 @@ fi
%changelog
-* Fri Aug 08 2014 Rex Dieter <rdieter@fedoraproject.org> 4.13.3-2
+* Fri Aug 08 2014 Rex Dieter <rdieter@fedoraproject.org> 4.13.97-2
- Requires: kqtquickcharts (#1125461)
+* Tue Aug 05 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.97-1
+- 4.13.97
+
* Tue Jul 15 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.3-1
- 4.13.3
diff --git a/sources b/sources
index daa5b98..dba6fb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2840e27e671c125fa4124ce87ebf3362 ktouch-4.13.3.tar.xz
+1c0cbfd5db1999be9ee3b72eb7ce93d5 ktouch-4.13.97.tar.xz
reply other threads:[~2026-08-04 19:53 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=178587319922.1.4820565716084764023.rpms-ktouch-6f1935b39519@fedoraproject.org \
--to=rdieter@math.unl.edu \
--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