| |
@@ -1,12 +1,10 @@
|
| |
Summary: Fedora package repositories
|
| |
Name: fedora-repos
|
| |
Version: 29
|
| |
- Release: 0.6%{?_module_build:%{?dist}}
|
| |
+ Release: 0.7%{?_module_build:%{?dist}}
|
| |
License: MIT
|
| |
- Group: System Environment/Base
|
| |
- URL: https://pagure.io/fedora-repos/
|
| |
- # tarball is created by running make archive in the git checkout
|
| |
- Source: %{name}-%{version}.tar.bz2
|
| |
+ URL: https://fedoraproject.org/
|
| |
+
|
| |
Provides: fedora-repos(%{version})
|
| |
Requires: system-release(%{version})
|
| |
Requires: fedora-repos-rawhide = %{version}-%{release}
|
| |
@@ -16,6 +14,60 @@
|
| |
Provides: fedora-repos-modular = %{version}-%{release}
|
| |
BuildArch: noarch
|
| |
|
| |
+ Source1: archmap
|
| |
+ Source2: fedora.repo
|
| |
+ Source3: fedora-updates.repo
|
| |
+ Source4: fedora-updates-testing.repo
|
| |
+ Source5: fedora-rawhide.repo
|
| |
+ Source6: fedora-cisco-openh264.repo
|
| |
+
|
| |
+ Source10: RPM-GPG-KEY-fedora-7-primary
|
| |
+ Source11: RPM-GPG-KEY-fedora-8-primary
|
| |
+ Source12: RPM-GPG-KEY-fedora-8-primary-original
|
| |
+ Source13: RPM-GPG-KEY-fedora-9-primary
|
| |
+ Source14: RPM-GPG-KEY-fedora-9-primary-original
|
| |
+ Source15: RPM-GPG-KEY-fedora-9-secondary
|
| |
+ Source16: RPM-GPG-KEY-fedora-10-primary
|
| |
+ Source17: RPM-GPG-KEY-fedora-11-primary
|
| |
+ Source18: RPM-GPG-KEY-fedora-12-primary
|
| |
+ Source19: RPM-GPG-KEY-fedora-13-primary
|
| |
+ Source20: RPM-GPG-KEY-fedora-13-secondary
|
| |
+ Source21: RPM-GPG-KEY-fedora-14-primary
|
| |
+ Source22: RPM-GPG-KEY-fedora-14-secondary
|
| |
+ Source23: RPM-GPG-KEY-fedora-15-primary
|
| |
+ Source24: RPM-GPG-KEY-fedora-15-secondary
|
| |
+ Source25: RPM-GPG-KEY-fedora-16-primary
|
| |
+ Source26: RPM-GPG-KEY-fedora-16-secondary
|
| |
+ Source27: RPM-GPG-KEY-fedora-17-primary
|
| |
+ Source28: RPM-GPG-KEY-fedora-17-secondary
|
| |
+ Source29: RPM-GPG-KEY-fedora-18-primary
|
| |
+ Source30: RPM-GPG-KEY-fedora-18-secondary
|
| |
+ Source31: RPM-GPG-KEY-fedora-19-primary
|
| |
+ Source32: RPM-GPG-KEY-fedora-19-secondary
|
| |
+ Source33: RPM-GPG-KEY-fedora-20-primary
|
| |
+ Source34: RPM-GPG-KEY-fedora-20-secondary
|
| |
+ Source35: RPM-GPG-KEY-fedora-21-primary
|
| |
+ Source36: RPM-GPG-KEY-fedora-21-secondary
|
| |
+ Source37: RPM-GPG-KEY-fedora-22-primary
|
| |
+ Source38: RPM-GPG-KEY-fedora-22-secondary
|
| |
+ Source39: RPM-GPG-KEY-fedora-23-primary
|
| |
+ Source40: RPM-GPG-KEY-fedora-23-secondary
|
| |
+ Source41: RPM-GPG-KEY-fedora-24-primary
|
| |
+ Source42: RPM-GPG-KEY-fedora-24-secondary
|
| |
+ Source43: RPM-GPG-KEY-fedora-25-primary
|
| |
+ Source44: RPM-GPG-KEY-fedora-25-secondary
|
| |
+ Source45: RPM-GPG-KEY-fedora-26-primary
|
| |
+ Source46: RPM-GPG-KEY-fedora-26-secondary
|
| |
+ Source47: RPM-GPG-KEY-fedora-27-primary
|
| |
+ Source48: RPM-GPG-KEY-fedora-28-primary
|
| |
+ Source49: RPM-GPG-KEY-fedora-29-primary
|
| |
+
|
| |
+ Source100: fedora-modular.repo
|
| |
+ Source101: fedora-updates-modular.repo
|
| |
+ Source102: fedora-updates-testing-modular.repo
|
| |
+ Source103: fedora-rawhide-modular.repo
|
| |
+ Source104: RPM-GPG-KEY-fedora-modularity
|
| |
+
|
| |
%description
|
| |
Fedora package repository files for yum and dnf along with gpg public keys
|
| |
|
| |
@@ -39,14 +91,13 @@
|
| |
|
| |
|
| |
%prep
|
| |
- %setup -q
|
| |
|
| |
%build
|
| |
|
| |
%install
|
| |
# Install the keys
|
| |
install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
|
| |
- install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
|
| |
+ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
|
| |
|
| |
# Link the primary/secondary keys to arch files, according to archmap.
|
| |
# Ex: if there's a key named RPM-GPG-KEY-fedora-19-primary, and archmap
|
| |
@@ -55,7 +106,7 @@
|
| |
pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
|
| |
for keyfile in RPM-GPG-KEY*; do
|
| |
key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
|
| |
- arches=$(sed -ne "s/^${key}://p" $RPM_BUILD_DIR/%{name}-%{version}/archmap) \
|
| |
+ arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \
|
| |
|| echo "WARNING: no archmap entry for $key"
|
| |
for arch in $arches; do
|
| |
# replace last part with $arch (fedora-20-primary -> fedora-20-$arch)
|
| |
@@ -67,13 +118,12 @@
|
| |
popd
|
| |
|
| |
install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
|
| |
- for file in fedora*repo ; do
|
| |
+ for file in %{_sourcedir}/fedora*repo ; do
|
| |
install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
|
| |
done
|
| |
|
| |
|
| |
%files
|
| |
- %defattr(-,root,root,-)
|
| |
%dir /etc/yum.repos.d
|
| |
%config(noreplace) /etc/yum.repos.d/fedora.repo
|
| |
%config(noreplace) /etc/yum.repos.d/fedora-modular.repo
|
| |
@@ -85,17 +135,19 @@
|
| |
%config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
|
| |
|
| |
%files rawhide
|
| |
- %defattr(-,root,root,-)
|
| |
%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
|
| |
%config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
|
| |
|
| |
|
| |
%files -n fedora-gpg-keys
|
| |
%dir /etc/pki/rpm-gpg
|
| |
- /etc/pki/rpm-gpg/*
|
| |
+ /etc/pki/rpm-gpg/RPM-GPG-KEY-*
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Wed Aug 8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 29-0.7
|
| |
+ - Increment and build for source merge change
|
| |
+
|
| |
* Tue Jul 31 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.6
|
| |
- Merge modular repos into the main package
|
| |
- Part of https://fedoraproject.org/wiki/Changes/ModulesForEveryone
|
| |
To help streamline the creation of fedora-repos merge all the bits into the main rpm src repository. The output is identical to what is produced but it allows a single git repository as a single location for any changes and issues for these extremely Fedora specific packages.
Some of the commentary is covered in rel-eng ticket https://pagure.io/releng/issue/7612 but a lot is also spread over devel@ mailing list.
Signed-off-by: Peter Robinson pbrobinson@gmail.com