#94 F33: Backport recent rawhide changes
Merged 3 years ago by sgallagh. Opened 3 years ago by churchyard.
rpms/ churchyard/fedora-repos f33-rawhide_if  into  f33

file modified
+18
@@ -10,6 +10,9 @@ 

  Provides:       fedora-repos(%{version}) = %{release}

  Requires:       system-release(%{version})

  Obsoletes:      fedora-repos < 33-0.7

+ %if %{rawhide_release} == %{version}

+ Requires:       fedora-repos-rawhide = %{version}-%{release}

+ %endif

  Requires:       fedora-gpg-keys >= %{version}-%{release}

  BuildArch:      noarch

  
@@ -85,6 +88,9 @@ 

  %package modular

  Summary:        Fedora modular package repositories

  Requires:       fedora-repos = %{version}-%{release}

+ %if %{rawhide_release} == %{version}

+ Requires:       fedora-repos-rawhide-modular = %{version}-%{release}

+ %endif

  Obsoletes:      fedora-repos < 33-0.7

  

  %description modular
@@ -181,6 +187,18 @@ 

  install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/

  install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/

  

+ 

+ %check

+ # assert all rawhide/eln repos are set to enabled only when this is rawhide

+ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do

+   %if %{rawhide_release} == %{version}

+     grep 'enabled=1' $repo

+   %else

+     grep 'enabled=1' $repo && exit 1 || :

+   %endif

+ done

+ 

+ 

  %files

  %dir /etc/yum.repos.d

  %config(noreplace) /etc/yum.repos.d/fedora.repo