From 37fd0a281dffa0f721395dd64f054d9aab36076e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Nov 16 2009 20:03:47 +0000 Subject: 0.5.10 --- diff --git a/.cvsignore b/.cvsignore index 33daab1..33f9ac1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mash-0.5.8.tar.gz +mash-0.5.10.tar.gz diff --git a/mash-f12key.patch b/mash-f12key.patch deleted file mode 100644 index 4805746..0000000 --- a/mash-f12key.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 190201a52d9067e276f9e71ca5a68a338b4d8917 -Author: Bill Nottingham -Date: Mon Aug 10 15:32:18 2009 -0400 - - Add F12 key. - -diff --git a/configs/rawhide.mash b/configs/rawhide.mash -index 124de62..6a68ef8 100644 ---- a/configs/rawhide.mash -+++ b/configs/rawhide.mash -@@ -10,7 +10,7 @@ multilib_method = devel - tag = dist-rawhide - inherit = True - strict_keys = False --keys = D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 -+keys = 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/ - repoviewtitle = "Fedora Rawhide - %(arch)s" - arches = i386 x86_64 ppc ppc64 diff --git a/mash.spec b/mash.spec index 4b998b4..bb984a4 100644 --- a/mash.spec +++ b/mash.spec @@ -1,16 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.5.8 -Release: 5%{?dist} +Version: 0.5.10 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL URL: http://fedorahosted.org/releases/m/a/mash/ Source0: http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz -Patch0: mash-nodelta.patch -Patch1: mash-f12key.patch -Patch2: 0001-There-is-no-ppc-in-Fedora-rawhide-anymore.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 @@ -24,9 +21,6 @@ any multlib RPMs that are necessary. %prep %setup -q -#%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %{__python} setup.py build @@ -50,17 +44,16 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog -* Sun Nov 15 2009 Jesse Keating - 0.5.8-5 -- Drop ppc(64) from rawhide. Now secondary - -* Thu Aug 20 2009 Bill Nottingham 0.5.8-4 -- re-enable deltas - -* Tue Aug 11 2009 Bill Nottingham 0.5.8-3 -- add new F12 key to rawhide mash config - -* Fri Jul 24 2009 Bill Nottingham 0.5.8-2 -- disable deltas for rawhide during payload format mass rebuild +* Mon Nov 16 2009 Bill Nottingham 0.5.10-1 +- fix up distro_tags and content_tags +- bump rawhide version +- there is no ppc in Fedora rawhide anymore () + +* Mon Oct 5 2009 Bill Nottingham 0.5.9-1 +- set dist_tags & content_tags when making metadata; update rawhide config + () +- allow glibc-static as a devel package +- allow making ancient yum-arch metadata * Mon Jun 29 2009 Bill Nottingham 0.5.8-1 - noarch packages can have debuginfo too (#508746) diff --git a/sources b/sources index f5057bd..fc177f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf01baab29a01b70028bd2668d4455ea mash-0.5.8.tar.gz +c88ae3b5b50cac20c8e93b7d5fea389e mash-0.5.10.tar.gz