Compare commits
No commits in common. "c8" and "2525be71842ae56f2784ef0b9a335d4b4e642e00" have entirely different histories.
c8
...
2525be7184
|
|
@ -1 +1 @@
|
|||
9fd94cb7de302163015fcbc0e157c61323b1205d SOURCES/desktop-file-utils-0.26.tar.xz
|
||||
9fd94cb7de302163015fcbc0e157c61323b1205d desktop-file-utils-0.26.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1,9 @@
|
|||
SOURCES/desktop-file-utils-0.26.tar.xz
|
||||
desktop-file-utils-0.16.tar.bz2
|
||||
/desktop-file-utils-0.18.tar.bz2
|
||||
/desktop-file-utils-0.19.tar.xz
|
||||
/desktop-file-utils-0.20.tar.xz
|
||||
/desktop-file-utils-0.21.tar.xz
|
||||
/desktop-file-utils-0.22.tar.xz
|
||||
/desktop-file-utils-0.23.tar.xz
|
||||
/desktop-file-utils-0.24.tar.xz
|
||||
/desktop-file-utils-0.26.tar.xz
|
||||
|
|
|
|||
|
|
@ -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 <amigadave@amigadave.com>
|
||||
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 <amigadave@amigadave.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
Summary: Utilities for manipulating .desktop files
|
||||
Name: desktop-file-utils
|
||||
Version: 0.26
|
||||
Release: 1%{?dist}
|
||||
Release: 6%{?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
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2107278
|
||||
Patch0: desktop-file-utils-0.26-support-1.5.patch
|
||||
License: GPLv2+
|
||||
|
||||
|
|
@ -14,11 +14,6 @@ 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,45 @@ 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 <dking@redhat.com> - 0.26-1
|
||||
- Rebase to 0.26 (#2107277)
|
||||
- Support files conforming to 1.5 of the specification (#2107277)
|
||||
* Fri Jul 15 2022 David King <amigadave@amigadave.com> - 0.26-6
|
||||
- Support files conforming to 1.5 of the specification (#2107278)
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.26-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.26-4
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jun 24 2020 Kalev Lember <klember@redhat.com> - 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 <releng@fedoraproject.org> - 0.24-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Aug 14 2019 Kalev Lember <klember@redhat.com> - 0.24-1
|
||||
- Update to 0.24
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Apr 09 2018 Adam Williamson <awilliam@redhat.com> - 0.23-8
|
||||
- Add 'font' as a valid media type (#1564650, fdo#105785)
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Script to install in:
|
||||
# /usr/lib/rpm/redhat/find-provides.d
|
||||
#
|
||||
# Transform desktop mimetype info into RPM provides
|
||||
#
|
||||
# Author: Richard Hughes <richard@hughsie.com>
|
||||
# Based on other provides scripts from RPM
|
||||
#
|
||||
|
||||
#!/bin/sh
|
||||
OLD_IFS="$IFS"
|
||||
while read instfile ; do
|
||||
case "$instfile" in
|
||||
*.desktop)
|
||||
mime=`cat $instfile | grep MimeType | cut -d'=' -f2`
|
||||
IFS=';'
|
||||
for type in $mime ; do
|
||||
echo 'mimetype('$type')'
|
||||
done
|
||||
;;
|
||||
esac
|
||||
done
|
||||
IFS=$OLD_IFS
|
||||
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
Loading…
Reference in New Issue