diff --git a/.desktop-file-utils.metadata b/.desktop-file-utils.metadata deleted file mode 100644 index 596409a..0000000 --- a/.desktop-file-utils.metadata +++ /dev/null @@ -1 +0,0 @@ -9fd94cb7de302163015fcbc0e157c61323b1205d SOURCES/desktop-file-utils-0.26.tar.xz diff --git a/.gitignore b/.gitignore index 6282bb1..c421f69 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/desktop-file-utils-0.26.tar.xz +desktop-file-utils-0.26.tar.xz diff --git a/SOURCES/desktop-entry-mode-init.el b/desktop-entry-mode-init.el similarity index 100% rename from SOURCES/desktop-entry-mode-init.el rename to desktop-entry-mode-init.el diff --git a/SOURCES/desktop-file-utils-0.26-support-1.5.patch b/desktop-file-utils-0.26-support-1.5.patch similarity index 92% rename from SOURCES/desktop-file-utils-0.26-support-1.5.patch rename to desktop-file-utils-0.26-support-1.5.patch index 1954984..1e350ed 100644 --- a/SOURCES/desktop-file-utils-0.26-support-1.5.patch +++ b/desktop-file-utils-0.26-support-1.5.patch @@ -1,7 +1,7 @@ -From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001 +From 48586dd1a755a80ec8ce0e8151b3ba236d81502f Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 15 Feb 2022 10:54:40 +0000 -Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5 +Subject: [PATCH 1/2] Add support for SingleMainWindow key from 1.5 Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 --- @@ -23,10 +23,10 @@ index 62406ab..ebb03b5 100644 /* since 0.9.4 */ -- -2.38.1 +2.34.1 -From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001 +From e3e21bccfe257aa2a34d64a68582dcc2363c2606 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 15 Feb 2022 10:56:04 +0000 Subject: [PATCH 2/2] validate: Support version 1.5 @@ -79,5 +79,5 @@ index e6efd93..a7952cd 100644 #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry" #define GROUP_DESKTOP_ACTION "Desktop Action " -- -2.38.1 +2.34.1 diff --git a/SPECS/desktop-file-utils.spec b/desktop-file-utils.spec similarity index 82% rename from SPECS/desktop-file-utils.spec rename to desktop-file-utils.spec index f635923..a8a84db 100644 --- a/SPECS/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,24 +1,19 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 1%{?dist} +Release: 14%{?dist} URL: https://www.freedesktop.org/software/desktop-file-utils Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el # https://bugzilla.redhat.com/show_bug.cgi?id=2053905 Patch0: desktop-file-utils-0.26-support-1.5.patch -License: GPLv2+ +License: GPL-2.0-or-later BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: emacs BuildRequires: meson Requires: emacs-filesystem -# Old, removed in RHEL 9+. -Provides: emacs-%{name} = %{version}-%{release} -Provides: emacs-%{name}-el = %{version}-%{release} -Obsoletes: emacs-%{name} < 0.20-3 -Obsoletes: emacs-%{name}-el < 0.20-3 %description .desktop files are used to describe an application for inclusion in @@ -39,8 +34,8 @@ fixing it up in the process. %install %meson_install -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} -mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/desktop-file-utils +mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/desktop-file-utils install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.el touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc @@ -60,12 +55,69 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/desktop-file-edit.1* %{_emacs_sitestartdir}/desktop-entry-mode-init.el %ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc -%{_emacs_sitelispdir}/%{name} +%{_emacs_sitelispdir}/desktop-file-utils/ %changelog -* Thu Nov 10 2022 David King - 0.26-1 -- Rebase to 0.26 (#2107277) -- Support files conforming to 1.5 of the specification (#2107277) +* Tue Oct 29 2024 Troy Dawson - 0.26-14 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.26-13 +- Bump release for June 2024 mass rebuild + +* Mon Feb 12 2024 Tomas Popela - 0.26-12 +- Build for the SPDX license format change + +* Wed Jan 24 2024 Fedora Release Engineering - 0.26-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.26-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 0.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.26-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Feb 15 2022 David King - 0.26-6 +- Support files conforming to 1.5 of the specification (#2053905) + +* Thu Jan 20 2022 Fedora Release Engineering - 0.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 0.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jun 24 2020 Kalev Lember - 0.26-1 +- Update to 0.26 +- Switch to the meson build system +- Avoid hardcoding man page extensions +- Drop old emacs-desktop-file-utils obsoletes/provides + +* Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Aug 14 2019 Kalev Lember - 0.24-1 +- Update to 0.24 + +* Wed Jul 24 2019 Fedora Release Engineering - 0.23-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 0.23-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 0.23-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Mon Apr 09 2018 Adam Williamson - 0.23-8 - Add 'font' as a valid media type (#1564650, fdo#105785) diff --git a/sources b/sources new file mode 100644 index 0000000..e43fa50 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (desktop-file-utils-0.26.tar.xz) = 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831