From adfe995e2c1a920418b188ba94dd81e24ed82c5a Mon Sep 17 00:00:00 2001
From: Erich Eickmeyer <erich@ericheickmeyer.com>
Date: May 22 2020 03:12:45 +0000
Subject: Fix to not conflict with kde-settings


---

diff --git a/.gitignore b/.gitignore
index fbe92ad..d1480b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /fedora-jam-kde-theme-1.0.1.tar.xz
 /fedora-jam-kde-theme-2.0.0.tar.gz
 /fedora-jam-kde-theme-2.1.0.tar.gz
+/fedora-jam-kde-theme-3.0.0.tar.gz
diff --git a/fedora-jam-kde-theme.spec b/fedora-jam-kde-theme.spec
index ba667e0..f0d9f00 100644
--- a/fedora-jam-kde-theme.spec
+++ b/fedora-jam-kde-theme.spec
@@ -1,7 +1,7 @@
 Name:       fedora-jam-kde-theme
-Version:    2.1.0
+Version:    3.0.0
 Release:    1%{?dist}
-Summary:    Fedora Jam KDE Theme and Settings
+Summary:    Fedora Jam KDE Theme
 
 License:    MIT
 
@@ -14,22 +14,7 @@ Source1:    COPYING
 BuildArch:  noarch
 
 BuildRequires:  kde-filesystem
-
-	
-%if ! 0%{?bootstrap}
-# for f33+ , consider merging version_maj with version, ie, use Version: 33 --rex
-%global  version_maj %(echo %{?dist} | cut -dc -f2)
-%if 0%{?version_maj:1}
-BuildRequires: f%{version_maj}-backgrounds-kde
-%endif
-%endif
-
 # when kdebugrc was moved here
-Conflicts: kf5-kdelibs4support < 5.7.0-3
- 
-Obsoletes: kde-settings-ksplash < 24-2
-Obsoletes: kde-settings-minimal < 24-3
-	
 Requires: kde-filesystem
 # /etc/pam.d/ ownership
 Requires: pam
@@ -37,15 +22,12 @@ Requires: xdg-user-dirs
 ## add breeze deps here? probably, need more too -- rex
 Requires: breeze-icon-theme
 Requires: breeze-gtk
-Requires:   fedora-jam-backgrounds-kde
-Conflicts:  kde-settings
-Conflicts:  kde-settings-plasma
-Provides:   kde-settings
-Provides:   kde-settings-plasma
+Requires: kde-settings
+Requires: kde-settings-plasma
+Requires: fedora-jam-backgrounds-kde
 
 %description
-This is the Fedora Jam KDE Theme and settings files. It is similar to
-kde-settings except it uses the Breeze Dark theme by default.
+This is the Fedora Jam KDE Theme and settings files.
 
 %prep
 %autosetup -p1
@@ -65,61 +47,20 @@ fi
  
 cp -p %{SOURCE1} .
  
-# default wallpaper symlink
-%if 0%{?version_maj:1}
-mkdir -p %{buildroot}%{_datadir}/wallpapers
-ln -s F%{version_maj} %{buildroot}%{_datadir}/wallpapers/Fedora
-%endif
- 
-## unpackaged files
-
-%check
-%if 0%{?version_maj:1}
-test -f %{_datadir}/wallpapers/F%{version_maj} || ls -l %{_datadir}/wallpapers
-%endif
-
 %files
 %license COPYING
-%config(noreplace) %{_sysconfdir}/profile.d/kde.*
-%{_sysconfdir}/kde/env/env.sh
-%{_sysconfdir}/kde/env/gpg-agent-startup.sh
 %{_sysconfdir}/kde/shutdown/gpg-agent-shutdown.sh
 %{_sysconfdir}/kde/env/gtk2_rc_files.sh
-%if 0%{?fedora} || 0%{?rhel} > 7
-%{_sysconfdir}/kde/env/fedora-bookmarks.sh
-%{_datadir}/kde-settings/
-# these can probably go now -- rex
-%{_prefix}/lib/rpm/plasma4.prov
-%{_prefix}/lib/rpm/plasma4.req
-%{_prefix}/lib/rpm/fileattrs/plasma4.attr
-%{_datadir}/polkit-1/rules.d/11-fedora-kde-policy.rules
-%endif
-%config(noreplace) %{_sysconfdir}/xdg/kcm-about-distrorc
-%config(noreplace) %{_sysconfdir}/xdg/kdebugrc
-%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass
-%config(noreplace) %{_sysconfdir}/pam.d/kscreensaver
-# drop noreplace, so we can be sure to get the new kiosk bits
-%config %{_sysconfdir}/kderc
-%config %{_sysconfdir}/kde4rc
-%{_datadir}/applications/kde-mimeapps.list
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%exclude %{_datadir}/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js
-%endif
+%{_datadir}/kde-jam-settings/
 %{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/updates/00-start-here-2.js
-%{_sysconfdir}/xdg/plasma-workspace/env/env.sh
-%{_sysconfdir}/xdg/plasma-workspace/env/gtk2_rc_files.sh
-%{_sysconfdir}/xdg/plasma-workspace/env/gtk3_scrolling.sh
-%{_sysconfdir}/xdg/plasma-workspace/shutdown/kuiserver5.sh
+%{_sysconfdir}/xdg/plasma-workspace/env/env-jam.sh
 %{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora-jam.desktop/
 %{_datadir}/sddm/themes/01-breeze-fedora-jam
-%if 0%{?version_maj:1}
-%{_datadir}/wallpapers/Fedora
-%endif
 %config(noreplace) %{_sysconfdir}/sysctl.d/50-fedora-jam.conf
-%config(noreplace) %{_sysconfdir}/Trolltech.conf
-
 
 %changelog
+* Thu May 21 2020 Erich Eickmeyer <erich@ericheickmeyer.com> - 3.0.0-1
+
 * Wed May 20 2020 Erich Eickmeyer <erich@ericheickmeyer.com> - 2.1.0-1
 - Add default screen locker wallpaper
 - Changes to default look and feel
diff --git a/sources b/sources
index 823ed69..f3fb786 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-jam-kde-theme-2.1.0.tar.gz) = 59632f5ad78506a999e4286c5454a67518366ea7b7f2251856ad9f757853fbf85268934e07458fb66af7860fd7b60bc388f7871c99f016252a02a26102c7d037
+SHA512 (fedora-jam-kde-theme-3.0.0.tar.gz) = 4f43618da09f4cd1876c4b923a2bce218dd8802bf123aa5392838aa5a899a44233efac5c3497e5734d9a957a3bd44b52a40acbdb33cb9502ff46e27dad612b72