diff --git a/mash-keys.patch b/mash-keys.patch new file mode 100644 index 0000000..ca49784 --- /dev/null +++ b/mash-keys.patch @@ -0,0 +1,24 @@ +diff -up mash-0.5.21/configs/branched.mash.old mash-0.5.21/configs/branched.mash +--- mash-0.5.21/configs/branched.mash.old 2011-02-17 17:24:16.470732001 -0500 ++++ mash-0.5.21/configs/branched.mash 2011-02-17 17:24:33.753732001 -0500 +@@ -10,7 +10,7 @@ multilib_method = devel + tag = dist-f15 + inherit = False + strict_keys = True +-keys = 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 069C8460 ++keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 + repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/ + repoviewtitle = "Fedora Branched - %(arch)s" + arches = i386 x86_64 +diff -up mash-0.5.21/configs/rawhide.mash.old mash-0.5.21/configs/rawhide.mash +--- mash-0.5.21/configs/rawhide.mash.old 2011-02-10 21:43:46.000000000 -0500 ++++ mash-0.5.21/configs/rawhide.mash 2011-02-17 17:24:45.364732002 -0500 +@@ -10,7 +10,7 @@ multilib_method = devel + tag = dist-rawhide + inherit = True + strict_keys = False +-keys = 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 069C8460 ++keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 + repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/ + repoviewtitle = "Fedora Rawhide - %(arch)s" + arches = i386 x86_64 diff --git a/mash.spec b/mash.spec index 87d7ab4..ccc0afe 100644 --- a/mash.spec +++ b/mash.spec @@ -2,13 +2,14 @@ Name: mash Version: 0.5.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPLv2 URL: http://fedorahosted.org/releases/m/a/mash/ Source0: http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: mash-keys.patch Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 BuildRequires: python-devel @@ -21,6 +22,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Thu Feb 17 2011 Bill Nottingham 0.5.21-2 +- fix keys + * Tue Feb 10 2011 Bill Nottingham 0.5.21-1 - update configs for F15 () - add a knob for frobbing which ppc arch is preferred ()