Skip to content

Commit a66cf43

Browse files
authored
Upgraded xdg-utils to version 1.2.1 (#11699)
1 parent 31c66a0 commit a66cf43

6 files changed

Lines changed: 70 additions & 121 deletions

SPECS-EXTENDED/xdg-utils/0001-open-for-post-1.1.3-development.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

SPECS-EXTENDED/xdg-utils/0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.

SPECS-EXTENDED/xdg-utils/xdg-utils-git_checkout.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"Signatures": {
3-
"xdg-utils-1.1.3.tar.gz": "d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9",
4-
"xdg-utils-git_checkout.sh": "90195ebcfd437270360156f3dc633dfeed04e2dbc2199ed1a6c2deffa8603dbb"
3+
"xdg-utils-v1.2.1.tar.gz": "f6b648c064464c2636884c05746e80428110a576f8daacf46ef2e554dcfdae75"
54
}
6-
}
5+
}

SPECS-EXTENDED/xdg-utils/xdg-utils.spec

Lines changed: 66 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33

4-
Summary: Basic desktop integration functions
4+
Summary: Basic desktop integration functions
55
Name: xdg-utils
6-
Version: 1.1.3
7-
Release: 7%{?dist}
6+
Version: 1.2.1
7+
Release: 3%{?dist}
88

9-
URL: http://portland.freedesktop.org/
9+
URL: https://www.freedesktop.org/wiki/Software/xdg-utils/
1010
%if 0%{?snap:1}
1111
Source0: xdg-utils-%{version}-%{snap}.tar.gz
1212
%else
13-
# at least until freedesktop folks move over to release dir
14-
Source0: https://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-%{version}.tar.gz
15-
#Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?prerelease:-%{prerelease}}.tar.gz
13+
Source0: https://gitlab.freedesktop.org/xdg/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
1614
%endif
17-
Source1: xdg-utils-git_checkout.sh
18-
License: MIT
19-
20-
## upstream patches (treat as sources in lookaside cache)
21-
Patch1: 0001-open-for-post-1.1.3-development.patch
22-
Patch2: 0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch
15+
License: MIT
2316

2417
# make sure BuildArch comes *after* patches, to ensure %%autosetup works right
2518
# http://bugzilla.redhat.com/1084309
2619
BuildArch: noarch
2720

21+
BuildRequires: make
2822
BuildRequires: gawk
2923
BuildRequires: xmlto lynx
3024

@@ -35,7 +29,7 @@ Requires: which
3529
%description
3630
The %{name} package is a set of simple scripts that provide basic
3731
desktop integration functions for any Free Desktop, such as Linux.
38-
They are intended to provide a set of defacto standards.
32+
They are intended to provide a set of defacto standards.
3933
This means that:
4034
* Third party software developers can rely on these xdg-utils
4135
for all of their simple integration needs.
@@ -56,25 +50,25 @@ The following scripts are provided at this time:
5650

5751

5852
%prep
59-
%autosetup -n %{name}-%{version}%{?pre:-%{pre}} -p1
53+
%autosetup -n %{name}-v%{version} -p1
6054

6155

6256
%build
6357
%configure
6458

6559
%if 0%{?snap:1}
66-
make scripts-clean -C scripts
60+
make scripts-clean -C scripts
6761
make man scripts %{?_smp_mflags} -C scripts
6862
%endif
69-
make %{?_smp_mflags}
70-
63+
%make_build
7164

7265
%install
73-
make install DESTDIR=%{buildroot}
66+
%make_install
7467

7568

7669
%files
77-
%doc ChangeLog LICENSE README TODO
70+
%doc ChangeLog README.md TODO
71+
%license LICENSE
7872
%{_bindir}/xdg-desktop-icon
7973
%{_bindir}/xdg-desktop-menu
8074
%{_bindir}/xdg-email
@@ -94,8 +88,57 @@ make install DESTDIR=%{buildroot}
9488

9589

9690
%changelog
97-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.3-7
98-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
91+
* Thu Dec 26 2024 Aninda Pradhan <v-anipradhan@microsoft.com> - 1.2.1-3
92+
- Initial Azure Linux import from Fedora 41 (license: MIT)
93+
- License Verified
94+
95+
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
96+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
97+
98+
* Sun Feb 11 2024 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 1.2.1-1
99+
- Update to 1.2.1 (rhbz#2241305)
100+
101+
* Tue Jan 30 2024 Steve Cossette <farchord@gmail.com> - 1.2.0-1
102+
- Release to 1.2.0 final
103+
104+
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0~git20231511.21fb316-2
105+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
106+
107+
* Sat Nov 18 2023 Alessandro Astone <ales.astone@gmail.com> - 1.2.0~git20231511.21fb316-1
108+
- Update to 1.2.0~ git snapshot
109+
110+
* Tue Jul 25 2023 Rafael Guterres Jeffman <rjeffman@redhat.com> - 1.1.3-15
111+
- Use "grep -E" instead of the obsoleted "egrep"
112+
Resolves: BZ#2140197
113+
- mark LICENSE as %%license
114+
- Spec cleanup
115+
- Small patches, as a rule, are in git dist, to be more easy to read.
116+
- Migrated to SPDX license (noop)
117+
118+
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-14
119+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
120+
121+
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-13
122+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
123+
124+
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-12
125+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
126+
127+
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-11
128+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
129+
130+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-10
131+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
132+
133+
* Fri Apr 23 2021 Rex Dieter <rdieter@fedoraproject.org> - 1.1.3-9
134+
- pull in upstream fixes
135+
- xdg-open run indefinetly (#1881372)
136+
137+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-8
138+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
139+
140+
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-7
141+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
99142

100143
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-6
101144
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
@@ -392,5 +435,4 @@ make install DESTDIR=%{buildroot}
392435
- Requires: desktop-file-utils
393436

394437
* Mon Jul 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.1.beta1
395-
- 1.0beta1
396-
438+
- 1.0beta1

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29971,8 +29971,8 @@
2997129971
"type": "other",
2997229972
"other": {
2997329973
"name": "xdg-utils",
29974-
"version": "1.1.3",
29975-
"downloadUrl": "https://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-1.1.3.tar.gz"
29974+
"version": "1.2.1",
29975+
"downloadUrl": "https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v1.2.1/xdg-utils-v1.2.1.tar.gz"
2997629976
}
2997729977
}
2997829978
},

0 commit comments

Comments
 (0)