Skip to content

Commit e34141b

Browse files
authored
Upgraded kde-filesystem to version 5 (#11475)
1 parent a7f6d4d commit e34141b

3 files changed

Lines changed: 80 additions & 42 deletions

File tree

SPECS-EXTENDED/kde-filesystem/kde-filesystem.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"Signatures": {
33
"applnk-hidden-directory": "4f9331c90f76855579ab2de49dba6bd4e82b88409261035cb7e354e3a054c693",
44
"macros.kde4": "e73f416144bd39f03b3ca22a3202f2fc1faefd05ab5e13ddc5bd65dec896b13f",
5-
"teamnames": "ddc137b44dcd45b3c86b4c99aec7024541930c4bde810015576010ec590cea53"
5+
"teamnames": "0cc11aefa62e4b36bc8bbcc176602a9b4c6d989464bf7dff1858a9f5f73cddcd"
66
}
77
}

SPECS-EXTENDED/kde-filesystem/kde-filesystem.spec

Lines changed: 76 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@ Distribution: Azure Linux
1616
%define _kde4_buildtype release
1717
%define _kde4_macros_api 2
1818

19-
%define rpm_macros_dir %{_sysconfdir}/rpm
20-
2119
%define rpm_macros_dir %{_rpmconfigdir}/macros.d
2220

23-
2421
Summary: KDE filesystem layout
2522
Name: kde-filesystem
26-
Version: 4
27-
Release: 65%{?dist}
23+
Version: 5
24+
Release: 5%{?dist}
2825

2926
License: Public Domain
3027

@@ -40,29 +37,32 @@ Source2: macros.kde4
4037

4138
Source3: applnk-hidden-directory
4239

43-
Provides: kde4-macros(api) = %{_kde4_macros_api}
44-
4540
BuildRequires: gawk
4641

4742
Requires: filesystem
4843
Requires: rpm
4944

50-
# Help obsolete old package retirements
51-
52-
Obsoletes: kdegraphics <= 7:4.14.3
53-
Obsoletes: kdegraphics-devel <= 7:4.14.3
54-
Obsoletes: kdegraphics-libs <= 7:4.14.3
55-
Obsoletes: kdenetwork <= 7:4.14.3
56-
Obsoletes: kdenetwork-common <= 7:4.14.3
57-
Obsoletes: kdenetwork-devel <= 7:4.14.3
58-
Obsoletes: kdesdk <= 4.14.3
59-
Obsoletes: kdesdk-common <= 4.14.3
60-
Obsoletes: kdesdk-devel <= 4.14.3
61-
6245

6346
%description
6447
This package provides some directories that are required/used by KDE.
6548

49+
%package -n kde3-filesystem
50+
Summary: Filesystem for KDE 3
51+
License: Public Domain
52+
Requires: %{name} = %{version}-%{release}
53+
54+
%description -n kde3-filesystem
55+
This package provides some directories that are required/used by KDE 3 applications.
56+
57+
%package -n kde4-filesystem
58+
Summary: Filesystem and RPM macros for KDE 4
59+
License: Public Domain
60+
Provides: kde4-macros(api) = %{_kde4_macros_api}
61+
Requires: %{name} = %{version}-%{release}
62+
63+
%description -n kde4-filesystem
64+
This package provides some directories that are required/used by KDE 4 applications.
65+
6666

6767
%prep
6868

@@ -146,58 +146,94 @@ cat %{SOURCE2} >> $RPM_BUILD_ROOT%{rpm_macros_dir}/macros.kde4
146146

147147
## Plasma5, forward compatibility
148148
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
149+
mkdir -p $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}/kconf_update_bin
150+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/kconf_update
151+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/knsrcfiles
152+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/kpackage/{genericqml,kcms}
153+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/solid/{actions,devices}
149154

150155

151156
%files -f %{name}.list
152-
# KDE3
157+
%{_sysconfdir}/xdg/plasma-workspace/
158+
%{_prefix}/lib/kconf_update_bin/
159+
%{_prefix}/%{_lib}/kconf_update_bin/
160+
%dir %{_docdir}/HTML/
161+
%lang(en) %{_docdir}/HTML/en/
162+
%{_datadir}/config.kcfg/
163+
%{_datadir}/emoticons/
164+
%{_datadir}/icons/locolor/
165+
%{_datadir}/kconf_update/
166+
%{_datadir}/knsrcfiles/
167+
%{_datadir}/kpackage/
168+
%{_datadir}/solid/
169+
%{_datadir}/templates/
170+
%{_datadir}/wallpapers/
171+
172+
%files -n kde3-filesystem
153173
%{_sysconfdir}/kde/
154174
%{_datadir}/applications/kde/
155175
%{_datadir}/applnk/
156176
%{_datadir}/apps/
157177
%{_datadir}/autostart/
158178
%{_datadir}/config/
159-
%{_datadir}/config.kcfg/
160-
%{_datadir}/emoticons/
161-
%{_datadir}/icons/locolor
162179
%{_datadir}/mimelnk/
163180
%{_datadir}/services/
164181
%{_datadir}/servicetypes/
165-
%{_datadir}/templates/
166182
%{_prefix}/lib/kde3/
167183
%{_prefix}/%{_lib}/kde3/
168-
%dir %{_docdir}/HTML/
169-
%lang(en) %{_docdir}/HTML/en/
170184

171-
# KDE4
185+
%files -n kde4-filesystem
172186
%{rpm_macros_dir}/macros.kde4
173187
%{_kde4_sysconfdir}/kde/
174188
%{_kde4_libexecdir}/
175189
%{_kde4_includedir}/
176190
%{_kde4_appsdir}/
177191
%{_kde4_configdir}/
178-
%{_kde4_sharedir}/config.kcfg/
179-
%{_kde4_sharedir}/emoticons/
180192
%{_kde4_sharedir}/kde4/
181-
%{_kde4_sharedir}/templates/
182193
%{_kde4_datadir}/applications/kde4/
183194
%{_kde4_datadir}/autostart/
184-
%{_kde4_datadir}/icons/locolor/
185-
%{_kde4_datadir}/wallpapers/
186195
%{_kde4_prefix}/lib/kde4/
187196
%{_kde4_prefix}/%{_lib}/kde4/
188-
%dir %{_kde4_docdir}/HTML/
189-
%lang(en) %{_kde4_docdir}/HTML/en/
190-
191-
# Plasma5
192-
%{_sysconfdir}/xdg/plasma-workspace/
193197

194198

195199
%changelog
196-
* Fri Dec 10 2021 Thomas Crain <thcrain@microsoft.com> - 4-65
200+
* Thu Jan 02 2025 Aninda Pradhan <v-anipradhan@microsoft.com> - 5-5
201+
- Initial Azure Linux import from Fedora 41 (license: MIT)
197202
- License verified
198203

199-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4-64
200-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
204+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5-4
205+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
206+
207+
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5-3
208+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
209+
210+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5-2
211+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
212+
213+
* Mon Aug 21 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5-1
214+
- Consolidate all common KDE directories
215+
- Split out KDE 3 and 4 directories into subpackages
216+
217+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4-70
218+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
219+
220+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4-69
221+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
222+
223+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4-68
224+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
225+
226+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4-67
227+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
228+
229+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-66
230+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
231+
232+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-65
233+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
234+
235+
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-64
236+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
201237

202238
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-63
203239
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

SPECS-EXTENDED/kde-filesystem/teamnames

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ bo=Tibetan
2222
br=Breton
2323
bs=Bosnian
2424
ca=Catalan
25+
ca@valencia=Catalan (Valencian)
2526
cs=Czech
2627
cy=Welsh
2728
da=Danish
@@ -64,6 +65,7 @@ ms=Malay
6465
mt=Maltese
6566
nl=Dutch
6667
nb=Norwegian Bokmal
68+
nds=Low Saxon
6769
nso=Northern Sotho
6870
nn=Norwegian Nynorsk
6971
oc=Occitan
@@ -78,7 +80,7 @@ sk=Slovak
7880
sl=Slovenian
7981
sq=Albanian
8082
sr=Serbian
81-
sr@Latn=Serbian Latin
83+
sr@latin=Serbian Latin
8284
ss=Swati
8385
sv=Swedish
8486
ta=Tamil

0 commit comments

Comments
 (0)