From 7ed7574fc0a52f589a6b86c8845390e4895d1a3a Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Feb 13 2015 07:32:52 +0000 Subject: import mock-1.2.7 from upstream --- diff --git a/.gitignore b/.gitignore index 58c9020..83c038b 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ mock-1.1.4.tar.gz /mock-1.2.4.tar.xz /mock-1.2.5.tar.xz /mock-1.2.6.tar.xz +/mock-1.2.7.tar.xz diff --git a/mock.spec b/mock.spec index d0dbb8c..0d7eec2 100644 --- a/mock.spec +++ b/mock.spec @@ -1,7 +1,7 @@ # next four lines substituted by autoconf %define major 1 %define minor 2 -%define sub 6 +%define sub 7 %define extralevel %{nil} %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -61,7 +61,10 @@ Requires: python-requests Requires: python >= 2.6 BuildRequires: python-devel %endif - +%if 0%{?fedora} > 21 +Recommends: dnf +Recommends: dnf-plugins-core +%endif %description Mock takes an SRPM and builds it in a chroot. @@ -108,8 +111,8 @@ done autoreconf -vif %configure make -sed -i '1,$s/1.2.6/%{version}/' docs/mock.1 -sed -i '1,$s/1.2.6/%{version}/' docs/mockchain.1 +sed -i '1,$s/1.2.7/%{version}/' docs/mock.1 +sed -i '1,$s/1.2.7/%{version}/' docs/mockchain.1 %install rm -rf $RPM_BUILD_ROOT @@ -210,6 +213,11 @@ fi %endif %changelog +* Fri Feb 13 2015 Miroslav Suchý - 1.2.7-1 +- add Fedora 22 configs +- rawhide configs use DNF +- touch should not truncate file [RHBZ#1188770] + * Mon Feb 2 2015 Clark Williams - 1.2.6-1 - fix broken build issue - From Mikhail Campos Guadamuz : diff --git a/sources b/sources index ed63a8a..e69c1a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7d6c9edd9905ff765f319148a4bdf20 mock-1.2.6.tar.xz +a309c2e2871d2061105a2898d4bff568 mock-1.2.7.tar.xz