diff --git a/SPECS-EXTENDED/xdg-utils/0001-open-for-post-1.1.3-development.patch b/SPECS-EXTENDED/xdg-utils/0001-open-for-post-1.1.3-development.patch deleted file mode 100644 index 0472e213e10..00000000000 --- a/SPECS-EXTENDED/xdg-utils/0001-open-for-post-1.1.3-development.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0b73fb82ccf178d496bd8da5b8c0a6906b14d030 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Sun, 13 May 2018 08:40:55 -0500 -Subject: [PATCH 1/2] open for post 1.1.3 development - ---- - ChangeLog | 3 +++ - scripts/xdg-utils-common.in | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index c9eaeea..6864f88 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,6 @@ -+=== xdg-utils 1.1.4 === -+ -+ - === xdg-utils 1.1.3 === - - 2018-05-10 -diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in -index 9cfc8a3..a8abed8 100644 ---- a/scripts/xdg-utils-common.in -+++ b/scripts/xdg-utils-common.in -@@ -245,7 +245,7 @@ check_common_commands() - ;; - - --version) -- echo "@NAME@ 1.1.3" -+ echo "@NAME@ 1.1.3+" - exit_success - ;; - esac --- -2.17.0 - diff --git a/SPECS-EXTENDED/xdg-utils/0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch b/SPECS-EXTENDED/xdg-utils/0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch deleted file mode 100644 index f5ed02e371d..00000000000 --- a/SPECS-EXTENDED/xdg-utils/0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Thu, 24 May 2018 14:40:53 -0500 -Subject: [PATCH 2/2] xdg-open: better pcmanfm check (BR106636,BR106161) - ---- - ChangeLog | 2 ++ - scripts/xdg-open.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 6864f88..3eed7c4 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,7 @@ - === xdg-utils 1.1.4 === - -+2018-05-24 -+ * xdg-open: better pcmanfm check (BR106636,BR106161) - - === xdg-utils 1.1.3 === - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 630e63e..bf9da4c 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -451,7 +451,7 @@ open_lxde() - { - - # pcmanfm only knows how to handle file:// urls and filepaths, it seems. -- if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then -+ if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then - local file="$(file_url_to_path "$1")" - - # handle relative paths --- -2.17.0 - diff --git a/SPECS-EXTENDED/xdg-utils/xdg-utils-git_checkout.sh b/SPECS-EXTENDED/xdg-utils/xdg-utils-git_checkout.sh deleted file mode 100755 index b00452a0451..00000000000 --- a/SPECS-EXTENDED/xdg-utils/xdg-utils-git_checkout.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - - -MODULE=xdg-utils -VERSION=1.1.0 -DATE=$(date +%Y%m%d)git - -set -x - -rm -rf $MODULE - -git clone git://anongit.freedesktop.org/git/xdg/xdg-utils $MODULE/ -pushd $MODULE -git archive master --format tar --prefix=${MODULE}-${VERSION}/ | gzip -9 > ../${MODULE}-${VERSION}-${DATE}.tar.gz -popd - -rm -rf $MODULE diff --git a/SPECS-EXTENDED/xdg-utils/xdg-utils.signatures.json b/SPECS-EXTENDED/xdg-utils/xdg-utils.signatures.json index e670e820da7..ded50f22ba1 100644 --- a/SPECS-EXTENDED/xdg-utils/xdg-utils.signatures.json +++ b/SPECS-EXTENDED/xdg-utils/xdg-utils.signatures.json @@ -1,6 +1,5 @@ { "Signatures": { - "xdg-utils-1.1.3.tar.gz": "d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9", - "xdg-utils-git_checkout.sh": "90195ebcfd437270360156f3dc633dfeed04e2dbc2199ed1a6c2deffa8603dbb" + "xdg-utils-v1.2.1.tar.gz": "f6b648c064464c2636884c05746e80428110a576f8daacf46ef2e554dcfdae75" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/xdg-utils/xdg-utils.spec b/SPECS-EXTENDED/xdg-utils/xdg-utils.spec index 2c6220e7be8..2af1238a6c9 100644 --- a/SPECS-EXTENDED/xdg-utils/xdg-utils.spec +++ b/SPECS-EXTENDED/xdg-utils/xdg-utils.spec @@ -1,30 +1,24 @@ Vendor: Microsoft Corporation Distribution: Azure Linux -Summary: Basic desktop integration functions +Summary: Basic desktop integration functions Name: xdg-utils -Version: 1.1.3 -Release: 7%{?dist} +Version: 1.2.1 +Release: 3%{?dist} -URL: http://portland.freedesktop.org/ +URL: https://www.freedesktop.org/wiki/Software/xdg-utils/ %if 0%{?snap:1} Source0: xdg-utils-%{version}-%{snap}.tar.gz %else -# at least until freedesktop folks move over to release dir -Source0: https://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-%{version}.tar.gz -#Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?prerelease:-%{prerelease}}.tar.gz +Source0: https://gitlab.freedesktop.org/xdg/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz %endif -Source1: xdg-utils-git_checkout.sh -License: MIT - -## upstream patches (treat as sources in lookaside cache) -Patch1: 0001-open-for-post-1.1.3-development.patch -Patch2: 0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch +License: MIT # make sure BuildArch comes *after* patches, to ensure %%autosetup works right # http://bugzilla.redhat.com/1084309 BuildArch: noarch +BuildRequires: make BuildRequires: gawk BuildRequires: xmlto lynx @@ -35,7 +29,7 @@ Requires: which %description The %{name} package is a set of simple scripts that provide basic desktop integration functions for any Free Desktop, such as Linux. -They are intended to provide a set of defacto standards. +They are intended to provide a set of defacto standards. This means that: * Third party software developers can rely on these xdg-utils for all of their simple integration needs. @@ -56,25 +50,25 @@ The following scripts are provided at this time: %prep -%autosetup -n %{name}-%{version}%{?pre:-%{pre}} -p1 +%autosetup -n %{name}-v%{version} -p1 %build %configure %if 0%{?snap:1} -make scripts-clean -C scripts +make scripts-clean -C scripts make man scripts %{?_smp_mflags} -C scripts %endif -make %{?_smp_mflags} - +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %files -%doc ChangeLog LICENSE README TODO +%doc ChangeLog README.md TODO +%license LICENSE %{_bindir}/xdg-desktop-icon %{_bindir}/xdg-desktop-menu %{_bindir}/xdg-email @@ -94,8 +88,57 @@ make install DESTDIR=%{buildroot} %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 1.1.3-7 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Dec 26 2024 Aninda Pradhan - 1.2.1-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) +- License Verified + +* Sat Jul 20 2024 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Feb 11 2024 Zbigniew Jedrzejewski-Szmek - 1.2.1-1 +- Update to 1.2.1 (rhbz#2241305) + +* Tue Jan 30 2024 Steve Cossette - 1.2.0-1 +- Release to 1.2.0 final + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2.0~git20231511.21fb316-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Nov 18 2023 Alessandro Astone - 1.2.0~git20231511.21fb316-1 +- Update to 1.2.0~ git snapshot + +* Tue Jul 25 2023 Rafael Guterres Jeffman - 1.1.3-15 +- Use "grep -E" instead of the obsoleted "egrep" + Resolves: BZ#2140197 +- mark LICENSE as %%license +- Spec cleanup +- Small patches, as a rule, are in git dist, to be more easy to read. +- Migrated to SPDX license (noop) + +* Sat Jul 22 2023 Fedora Release Engineering - 1.1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Apr 23 2021 Rex Dieter - 1.1.3-9 +- pull in upstream fixes +- xdg-open run indefinetly (#1881372) + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Fri Jan 31 2020 Fedora Release Engineering - 1.1.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -392,5 +435,4 @@ make install DESTDIR=%{buildroot} - Requires: desktop-file-utils * Mon Jul 24 2006 Rex Dieter 1.0-0.1.beta1 -- 1.0beta1 - +- 1.0beta1 \ No newline at end of file diff --git a/cgmanifest.json b/cgmanifest.json index e724680b882..584108062bf 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -29951,8 +29951,8 @@ "type": "other", "other": { "name": "xdg-utils", - "version": "1.1.3", - "downloadUrl": "https://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-1.1.3.tar.gz" + "version": "1.2.1", + "downloadUrl": "https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v1.2.1/xdg-utils-v1.2.1.tar.gz" } } },