From 12a54aa1021434a0b00ee141339d5fccb0d6c1d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jan 29 2013 22:07:11 +0000 Subject: drop mashing arm rawhide, hfp only going forward --- diff --git a/0001-no-longer-mash-the-arm-tree-on-rawhide.patch b/0001-no-longer-mash-the-arm-tree-on-rawhide.patch new file mode 100644 index 0000000..8764ff0 --- /dev/null +++ b/0001-no-longer-mash-the-arm-tree-on-rawhide.patch @@ -0,0 +1,25 @@ +From 7ae49b56628f812dc2c3e1d2f52135e70631f52b Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Tue, 29 Jan 2013 09:57:47 -0600 +Subject: [PATCH] no longer mash the arm tree on rawhide + +--- + configs/rawhide.arm.mash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configs/rawhide.arm.mash b/configs/rawhide.arm.mash +index f2f5fe0..583920f 100644 +--- a/configs/rawhide.arm.mash ++++ b/configs/rawhide.arm.mash +@@ -13,7 +13,7 @@ strict_keys = False + keys = A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 + repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/rawhide/%(arch)s/os/ + repoviewtitle = "Fedora Rawhide - %(arch)s" +-arches = arm armhfp ++arches = armhfp + delta = True + # Change distro_tags as fedora-release version gets bumped + distro_tags = cpe:/o:fedoraproject:fedora:19 rawhide +-- +1.8.1 + diff --git a/mash.spec b/mash.spec index c310fd9..0057f76 100644 --- a/mash.spec +++ b/mash.spec @@ -2,13 +2,13 @@ Name: mash Version: 0.5.30 -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: 0001-no-longer-mash-the-arm-tree-on-rawhide.patch Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 BuildRequires: python-devel @@ -21,6 +21,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Tue Jan 29 2013 Dennis Gilmore - 0.5.30-2 +- drop mashing arm rawhide, hfp only going forward + * Thu Aug 09 2012 Dennis Gilmore 0.5.30-1 - setup branched and rawhide for f18