From c8182dac9a2b44b7aba20df312c99955246f1f8f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Oct 18 2018 12:47:38 +0000 Subject: Make repo files %config(noreplace) Also add dependency on fedora-repos to set up the filesystem. Resolves: rhbz#1640626 Signed-off-by: Stephen Gallagher --- diff --git a/fedora-workstation-repositories.spec b/fedora-workstation-repositories.spec index 75b9fe6..40b182b 100644 --- a/fedora-workstation-repositories.spec +++ b/fedora-workstation-repositories.spec @@ -1,6 +1,6 @@ Name: fedora-workstation-repositories -Version: 28 -Release: 2%{?dist} +Version: 29 +Release: 1%{?dist} Summary: Repository files for searchable repositories License: GPL @@ -15,6 +15,9 @@ BuildArch: noarch # For rpmfusions-nonfree repo keys Requires: distribution-gpg-keys +# For /etc/yum.repos.d +Requires: fedora-repos + %description Repository files that make some select non-Fedora software available via search in gnome-software. @@ -31,10 +34,16 @@ cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/ cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/ %files -%{_sysconfdir}/yum.repos.d/* - +%config(noreplace) %{_sysconfdir}/yum.repos.d/_copr_phracek-PyCharm.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/google-chrome.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-nonfree-steam.repo %changelog +* Thu Oct 18 2018 Stephen Gallagher - 29-1 +- Make repo files %%config(noreplace) so they aren't clobbered on upgrade if + they have been modified (such as being enabled). + * Fri Jul 13 2018 Fedora Release Engineering - 28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild