Drop forked Breeze Twilight theme in favor of in-tree one

- Include minor fix to contact email for Fedora theme

fedora.desktop

@@ -37,7 +37,7 @@ X-KDE-ServiceTypes=Plasma/LookAndFeel
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Fedora KDE SIG
 X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Email=kde@list.fedoraproject.org
+X-KDE-PluginInfo-Email=kde@lists.fedoraproject.org
 X-KDE-PluginInfo-License=GPLv2+
 X-KDE-PluginInfo-Name=org.fedoraproject.fedora.desktop
 X-KDE-PluginInfo-Version=2.0

plasma-workspace.spec

@@ -21,7 +21,7 @@
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
 Version: 5.22.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL:     https://invent.kde.org/plasma/%{name}
@@ -49,14 +49,6 @@ Source15:       fedora.desktop
 # includes f25-based preview (better than breeze or nothing at least)
 Source20:       breeze-fedora-0.2.tar.gz
 
-# breeze fedora plasma theme components
-# includes breeze twilight settings and preview files
-# this will not be needed in 5.22 when breeze twilight replaces breeze
-# cf. https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/552
-Source30:       breezetwilight-defaults
-Source31:       breezetwilight-fullscreenpreview.jpg
-Source32:       breezetwilight-preview.png
-
 ## systemd user service dependencies
 ## (debating whether these be owned here or somewhere better...
 ## in the repective pkgs themselves? -- rdieter)
@@ -459,13 +451,10 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee
 %patch105 -p1
 
 %if 0%{?fedora}
-cp -a lookandfeel lookandfeel-fedora
+cp -a lookandfeel.twilight lookandfeel.fedora
-install -m 0644 %{SOURCE15} lookandfeel-fedora/metadata.desktop
+install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop
-install -m 0644 %{SOURCE30} lookandfeel-fedora/contents/defaults
-install -m 0644 %{SOURCE31} lookandfeel-fedora/contents/previews/fullscreenpreview.jpg
-install -m 0644 %{SOURCE32} lookandfeel-fedora/contents/previews/preview.png
 cat >> CMakeLists.txt <<EOL
-plasma_install_package(lookandfeel-fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
+plasma_install_package(lookandfeel.fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
 EOL
 %endif
 
@@ -751,6 +740,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 
 
 %changelog
+* Mon Sep 20 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.22.90-3
+- Drop forked Breeze Twilight theme in favor of in-tree one
+
 * Mon Sep 20 2021 Marc Deop <marcdeop@fedoraproject.org> - 5.22.90-2
 - Remove patch(180) already applied upstream
 - Remove patch(181) already applied upstream

sources

@@ -1,5 +1,2 @@
 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
-SHA512 (breezetwilight-defaults) = f84d4543c0c42609f4f3300fd720ebfc60686c0e5f53a1695bea603876697dd7eb27399f705035b81ab4b5e5eeabec6569aeeff6100a96149f8a2921376ae223
-SHA512 (breezetwilight-fullscreenpreview.jpg) = e9e60cbe450696d9d7ed1f5f30122150079f0b75106be3a52122a1c246dca66bd99b75be850434ec3ae37b003a51423d495a506d3e35f2e0a563be172dec1cdb
-SHA512 (breezetwilight-preview.png) = e625ebd61624a0ac45d80f274c7f6ed2f1dd3ac1f7d66cc2a72524545ca4fc7a3997dd90a57a506b4840978a47c5403630b65ea546d37ab1de165ebf013e8148
 SHA512 (plasma-workspace-5.22.90.tar.xz) = 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816

sources.keep

@@ -1,4 +1 @@
 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
-SHA512 (breezetwilight-defaults) = f84d4543c0c42609f4f3300fd720ebfc60686c0e5f53a1695bea603876697dd7eb27399f705035b81ab4b5e5eeabec6569aeeff6100a96149f8a2921376ae223
-SHA512 (breezetwilight-fullscreenpreview.jpg) = e9e60cbe450696d9d7ed1f5f30122150079f0b75106be3a52122a1c246dca66bd99b75be850434ec3ae37b003a51423d495a506d3e35f2e0a563be172dec1cdb
-SHA512 (breezetwilight-preview.png) = e625ebd61624a0ac45d80f274c7f6ed2f1dd3ac1f7d66cc2a72524545ca4fc7a3997dd90a57a506b4840978a47c5403630b65ea546d37ab1de165ebf013e8148