Skip to content

Commit 8f8278e

Browse files
authored
Upgrade: xfconf version to 4.18.3 (#12976)
1 parent 11653a1 commit 8f8278e

3 files changed

Lines changed: 62 additions & 22 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"xfconf-4.14.4.tar.bz2": "cc37622eece51ed8905dfaad6f77b3c24662f41881545eb0142110f347ba5f73"
3+
"xfconf-4.18.3.tar.bz2": "c56cc69056f6947b2c60b165ec1e4c2b0acf26a778da5f86c89ffce24d5ebd98"
44
}
55
}

SPECS-EXTENDED/xfconf/xfconf.spec

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3-
%global xfceversion 4.14
3+
%global xfceversion 4.18
44
%bcond_with perl
55

66
Name: xfconf
7-
Version: 4.14.4
7+
Version: 4.18.3
88
Release: 4%{?dist}
99
Summary: Hierarchical configuration system for Xfce
1010

1111
License: GPLv2
12-
URL: http://www.xfce.org/
12+
URL: https://www.xfce.org/
1313
#VCS git:git://git.xfce.org/xfce/xfconf
14-
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
14+
Source0: https://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
1515

16+
BuildRequires: make
1617
BuildRequires: glib2-devel
1718
BuildRequires: perl(File::Find)
1819
BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion}
@@ -33,7 +34,7 @@ BuildRequires: gcc-c++
3334
BuildRequires: gobject-introspection-devel
3435
BuildRequires: vala
3536

36-
Requires: dbus-x11
37+
Requires: dbus
3738

3839
Obsoletes: libxfce4mcs < 4.4.3-3
3940
Obsoletes: xfconf-perl < 4.13.8
@@ -69,14 +70,9 @@ interact with xfconf using perl.
6970
%endif
7071

7172
%prep
72-
%setup -q
73+
%autosetup
7374

7475
%build
75-
# gobject introspection does not work with LTO. There is an effort to fix this
76-
# in the appropriate project upstreams, so hopefully LTO can be enabled someday
77-
# Disable LTO.
78-
%define _lto_cflags %{nil}
79-
8076
%configure --disable-static --with-perl-options=INSTALLDIRS="vendor"
8177
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
8278
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -111,7 +107,7 @@ find %{buildroot} -type f -name *.la -exec rm -f {} \;
111107

112108
%files -f %{name}.lang
113109
%license COPYING
114-
%doc AUTHORS ChangeLog NEWS TODO
110+
%doc AUTHORS NEWS TODO
115111
%{_libdir}/lib*.so.*
116112
%{_bindir}/xfconf-query
117113
%{_libdir}/xfce4/xfconf/
@@ -120,12 +116,15 @@ find %{buildroot} -type f -name *.la -exec rm -f {} \;
120116
%{_datadir}/vala/vapi/libxfconf-0.vapi
121117
%{_datadir}/dbus-1/services/org.xfce.Xfconf.service
122118
%{_datadir}/gir-1.0/Xfconf-0.gir
119+
%{_datadir}/bash-completion/completions/xfconf-query
123120

124121
%files devel
125122
%doc %{_datadir}/gtk-doc
126123
%{_libdir}/lib*.so
127124
%{_libdir}/pkgconfig/*.pc
128125
%{_includedir}/xfce4/xfconf-0
126+
%{_libdir}/gio/modules/libxfconfgsettingsbackend.so
127+
%{_datadir}/gtk-doc/html/%{name}/*
129128

130129
%if %{with perl}
131130
%files perl
@@ -135,15 +134,56 @@ find %{buildroot} -type f -name *.la -exec rm -f {} \;
135134
%endif
136135

137136
%changelog
138-
* Wed Feb 16 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.14.4-4
137+
* Mon Mar 17 2025 Archana Shettigar <v-shettigara@microsoft.com> - 4.18.3-4
138+
- Initial Azure Linux import from Fedora 41 (license: MIT).
139+
- Adding missing BRs on Perl modules.
140+
- Unconditionally use "%%bcond_with perl"
139141
- License verified.
140142

141-
* Tue Feb 15 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.14.4-3
142-
- Adding missing BRs on Perl modules.
143+
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.3-3
144+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
143145

144-
* Thu May 27 2021 Thomas Crain <thcrain@microsoft.com> - 4.14.4-2
145-
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
146-
- Unconditionally use "%%bcond_with perl"
146+
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.3-2
147+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
148+
149+
* Thu Nov 16 2023 Mukundan Ragavan <nonamedotc@gmail.com> - 4.18.3-1
150+
- Update to v4.18.3
151+
152+
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.1-2
153+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
154+
155+
* Fri Apr 21 2023 Mukundan Ragavan <nonamedotc@gmail.com> - 4.18.1-1
156+
- Update to v4.18.1
157+
158+
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.0-2
159+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
160+
161+
* Mon Jan 16 2023 Mukundan Ragavan <nonamedotc@gmail.com> - 4.18.0-1
162+
- Update to v4.18.0 (Xfce 4.18)
163+
164+
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-8
165+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
166+
167+
* Fri May 13 2022 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.16.0-7
168+
- Remove all perl conditionals
169+
170+
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-6
171+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
172+
173+
* Sun Sep 19 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.16.0-5
174+
- Replace dbus-x11 with dbus in requires (fixes bz#1975572)
175+
176+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-4
177+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
178+
179+
* Sun May 09 2021 Jeff Law <jlaw@tachyum.com> - 4.16.0-3
180+
- Re-enable LTO now that gobject-introspection has been fixed.
181+
182+
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-2
183+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
184+
185+
* Wed Dec 23 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.16.0-1
186+
- Update to 4.16.0
147187

148188
* Tue Nov 10 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.14.4-1
149189
- Update to 4.14.4
@@ -156,7 +196,7 @@ find %{buildroot} -type f -name *.la -exec rm -f {} \;
156196
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
157197

158198
* Tue Jun 30 2020 Jeff Law <law@redhat.com> - 4.14.3-2
159-
Disable LTO
199+
- Disable LTO
160200

161201
* Wed May 06 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.14.3-1
162202
- Update to 4.14.3

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30352,8 +30352,8 @@
3035230352
"type": "other",
3035330353
"other": {
3035430354
"name": "xfconf",
30355-
"version": "4.14.4",
30356-
"downloadUrl": "http://archive.xfce.org/src/xfce/xfconf/4.14/xfconf-4.14.4.tar.bz2"
30355+
"version": "4.18.3",
30356+
"downloadUrl": "https://archive.xfce.org/src/xfce/xfconf/4.18/xfconf-4.18.3.tar.bz2"
3035730357
}
3035830358
}
3035930359
},

0 commit comments

Comments
 (0)