[generic-release] sync, add location params to repo files
Tom Callaway
spot at fedoraproject.org
Wed Oct 20 18:27:13 UTC 2010
commit 66f7ae5ac9c430119d240e3a9e2240c3be70b291
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Wed Oct 20 14:27:10 2010 -0400
sync, add location params to repo files
.gitignore | 2 ++
generic-release.spec | 15 +++++++++++----
sources | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8d8294..6c95095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
generic-release-14.tar.gz
+/generic-release-15.tar.bz2
+/generic-release-15.tar.gz
diff --git a/generic-release.spec b/generic-release.spec
index 62190eb..b5afa79 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -1,10 +1,10 @@
%define release_name Generic
-%define dist_version 14
+%define dist_version 15
Summary: Generic release files
Name: generic-release
-Version: 14
-Release: 0.2
+Version: 15
+Release: 0.3
License: GPLv2
Group: System Environment/Base
Source: %{name}-%{version}.tar.gz
@@ -67,11 +67,15 @@ install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
# Install all the keys, link the primary keys to primary arch files
# and to compat generic location
pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
-for arch in i386 x86_64 ppc ppc64
+for arch in i386 x86_64
do
ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
done
ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
+for arch in sparc sparc64
+ do
+ ln -s RPM-GPG-KEY-fedora-%{dist_version}-SPARC RPM-GPG-KEY-fedora-$arch
+done
popd
install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -117,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
%changelog
+* Wed Oct 20 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 15-0.3
+- sync to rawhide
+
* Wed Feb 24 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 14-0.2
- fix broken requires
diff --git a/sources b/sources
index 108676a..ec47242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c7b5b5d62edc2f7a47cf9deefd071bb generic-release-14.tar.gz
+9fe6a7ffa425ef0aa53c4bd4b834109e generic-release-15.tar.gz
More information about the scm-commits
mailing list