From 543c478f703ce3ed20af3aeb669777746fb60941 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Nov 14 2013 05:10:53 +0000 Subject: update source tarball --- diff --git a/fedora-release.spec b/fedora-release.spec index 33dbaf3..05bdcfb 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -1,20 +1,19 @@ %define release_name Schrödinger’s Cat %define dist_version 19 -Summary: Fedora release files -Name: fedora-release -Version: 19 -Release: 5 -License: GPLv2 -Group: System Environment/Base -URL: http://fedoraproject.org -Source: %{name}-%{version}.tar.bz2 -Source1: archmap -Obsoletes: redhat-release -Provides: redhat-release -Provides: system-release = %{version}-%{release} +Summary: Fedora release files +Name: fedora-release +Version: 19 +Release: 5 +License: GPLv2 +Group: System Environment/Base +URL: http://fedoraproject.org +Source0: %{name}-%{version}.tar.bz2 +Obsoletes: redhat-release +Provides: redhat-release +Provides: system-release = %{version}-%{release} Obsoletes: fedora-release-rawhide < %{version}-1 -BuildArch: noarch +BuildArch: noarch %description Fedora release files such as yum configs and various /etc/ files that @@ -67,7 +66,7 @@ install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ 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" %{SOURCE1}) \ + arches=$(sed -ne "s/^${key}://p" archmap) \ || echo "WARNING: no archmap entry for $key" for arch in $arches; do # replace last part with $arch (fedora-20-primary -> fedora-20-$arch) @@ -88,9 +87,9 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/rpm cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF # dist macros. -%%fedora %{dist_version} -%%dist .fc%{dist_version} -%%fc%{dist_version} 1 +%%fedora %{dist_version} +%%dist .fc%{dist_version} +%%fc%{dist_version} 1 EOF %clean diff --git a/sources b/sources index 8f523e8..8e66b2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de08dd4ba10596166357bfb46c3513d fedora-release-19.tar.bz2 +cf261733b497d4bd5cdda9edf7ee7e6e fedora-release-19.tar.bz2