#3 Make repo files %config(noreplace)
Merged 5 years ago by kalev. Opened 5 years ago by sgallagh.
rpms/ sgallagh/fedora-workstation-repositories master  into  master

@@ -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 @@ 

  # 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 %{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 <sgallagh@redhat.com> - 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 <releng@fedoraproject.org> - 28-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

Also add dependency on fedora-repos to set up the filesystem.

Resolves: rhbz#1640626

CC @tpopela @kalev

Signed-off-by: Stephen Gallagher sgallagh@redhat.com

rebased onto c8182da

5 years ago

Looks good to me, thanks!

Pull-Request has been merged by kalev

5 years ago