[mock/el6] import mock-1.2.7 from upstream

Miroslav Suchý msuchy at fedoraproject.org
Fri Feb 13 07:47:38 UTC 2015


commit efea67afaf5f1c1ff9f3c3b4d6643f89080d6aa4
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Feb 13 08:32:52 2015 +0100

    import mock-1.2.7 from upstream
    
    (cherry picked from commit 7ed7574fc0a52f589a6b86c8845390e4895d1a3a)

 .gitignore |    1 +
 mock.spec  |   16 ++++++++++++----
 sources    |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a890f59..27deb45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,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ý <msuchy at redhat.com> - 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 <williams at redhat.com> - 1.2.6-1
 - fix broken build issue
 - From Mikhail Campos Guadamuz <Mikhail_Campos-Guadamuz at epam.com>:
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


More information about the scm-commits mailing list