diff --git a/0001-update-the-mash-configs-for-rawhide.patch b/0001-update-the-mash-configs-for-rawhide.patch new file mode 100644 index 0000000..c1dc76c --- /dev/null +++ b/0001-update-the-mash-configs-for-rawhide.patch @@ -0,0 +1,95 @@ +From 42baaf6df456a62a1d256c352518d2e4127cad28 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Tue, 10 Feb 2015 16:22:31 -0600 +Subject: [PATCH] update the mash configs for rawhide + +--- + configs/rawhide.arm.mash | 4 ++-- + configs/rawhide.mash | 4 ++-- + configs/rawhide.ppc.mash | 4 ++-- + configs/rawhide.s390.mash | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configs/rawhide.arm.mash b/configs/rawhide.arm.mash +index e487304..1a3e939 100644 +--- a/configs/rawhide.arm.mash ++++ b/configs/rawhide.arm.mash +@@ -6,7 +6,7 @@ repodata_path = %(arch)s/os/ + source_path = source/SRPMS + debuginfo = True + multilib = False +-tag = f22 ++tag = f23 + inherit = False + strict_keys = False + keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C +@@ -16,5 +16,5 @@ arches = aarch64 + delta = True + max_delta_rpm_age = 604800 + # Change distro_tags as fedora-release version gets bumped +-distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide ++distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide + hash_packages = True +diff --git a/configs/rawhide.mash b/configs/rawhide.mash +index 2e45d32..8969bc8 100644 +--- a/configs/rawhide.mash ++++ b/configs/rawhide.mash +@@ -7,7 +7,7 @@ source_path = source/SRPMS + debuginfo = True + multilib = True + multilib_method = devel +-tag = f22 ++tag = f23 + inherit = False + strict_keys = False + keys = 246110C1, FB4b18E6, DE7F38BD, 22B3B81A, 1ACA3465, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, 8E1431D5 +@@ -19,5 +19,5 @@ max_delta_rpm_size = 800000000 + max_delta_rpm_age = 604800 + delta_workers = 8 + # Change distro_tags as fedora-release version gets bumped +-distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide ++distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide + hash_packages = True +diff --git a/configs/rawhide.ppc.mash b/configs/rawhide.ppc.mash +index 6223b88..e5a0744 100644 +--- a/configs/rawhide.ppc.mash ++++ b/configs/rawhide.ppc.mash +@@ -6,7 +6,7 @@ repodata_path = %(arch)s/os/ + source_path = source/SRPMS + debuginfo = True + multilib = False +-tag = f22 ++tag = f23 + inherit = False + strict_keys = False + keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C +@@ -16,5 +16,5 @@ arches = ppc64le ppc64 + delta = True + max_delta_rpm_age = 604800 + # Change distro_tags as fedora-release version gets bumped +-distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide ++distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide + hash_packages = True +diff --git a/configs/rawhide.s390.mash b/configs/rawhide.s390.mash +index 8de136c..728f903 100644 +--- a/configs/rawhide.s390.mash ++++ b/configs/rawhide.s390.mash +@@ -7,7 +7,7 @@ source_path = source/SRPMS + debuginfo = True + multilib = True + multilib_method = devel +-tag = f22 ++tag = f23 + inherit = False + strict_keys = False + keys = 4B94091B, BA094068, A4D647E9, F8DF67E6, 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9, A29CB19C +@@ -17,5 +17,5 @@ arches = s390 s390x + delta = True + max_delta_rpm_age = 604800 + # Change distro_tags as fedora-release version gets bumped +-distro_tags = cpe:/o:fedoraproject:fedora:22 rawhide ++distro_tags = cpe:/o:fedoraproject:fedora:23 rawhide + hash_packages = True +-- +2.3.0 + diff --git a/mash.spec b/mash.spec index 0c6ee99..778ba1b 100644 --- a/mash.spec +++ b/mash.spec @@ -2,12 +2,14 @@ Name: mash Version: 0.6.13 -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 +Patch0: 0001-update-the-mash-configs-for-rawhide.patch + Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 BuildRequires: python-devel @@ -21,6 +23,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -42,6 +45,9 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/mash /var/cache/mash %changelog +* Tue Feb 10 2015 Dennis Gilmore - 0.6.13-2 +- add patch moving rawhide to f23 + * Mon Jan 19 2015 Dennis Gilmore - 0.6.13-1 - make sure we keep values expected to be integers, integers - when reading the config file