[mock] fix broken build issue

John Clark Williams jcwillia at fedoraproject.org
Mon Feb 2 22:25:09 UTC 2015


commit 08bdebab67116702a3a2f9d8eaf97d4b2b36265e
Author: Clark Williams <clark.williams at gmail.com>
Date:   Mon Feb 2 16:24:53 2015 -0600

    fix broken build issue
    
    - From Mikhail Campos Guadamuz <Mikhail_Campos-Guadamuz at epam.com>:
      - use default logging.ini if non-default does not exist [RHBZ#1187727]
    - From Michael Simacek <msimacek at redhat.com>:
      - Update manpage regarding multiple arguments
      - Take package arguments in update [RHBZ#1187136]
    - From Miroslav Suchý <msuchy at redhat.com>:
      - reset LC before calling lvm commands [RHBZ#1185912]

 .gitignore |    1 +
 mock.spec  |   16 +++++++++++++---
 sources    |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5af4d5..58c9020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ mock-1.1.4.tar.gz
 /mock-1.2.3.tar.xz
 /mock-1.2.4.tar.xz
 /mock-1.2.5.tar.xz
+/mock-1.2.6.tar.xz
diff --git a/mock.spec b/mock.spec
index 6e6988f..d0dbb8c 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 5
+%define sub 6
 %define extralevel %{nil}
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
 
@@ -108,8 +108,8 @@ done
 autoreconf -vif
 %configure
 make
-sed -i '1,$s/1.2.5/%{version}/' docs/mock.1
-sed -i '1,$s/1.2.5/%{version}/' docs/mockchain.1
+sed -i '1,$s/1.2.6/%{version}/' docs/mock.1
+sed -i '1,$s/1.2.6/%{version}/' docs/mockchain.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -210,6 +210,16 @@ fi
 %endif
 
 %changelog
+* 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>:
+  - use default logging.ini if non-default does not exist [RHBZ#1187727]
+- From Michael Simacek <msimacek at redhat.com>:
+  - Update manpage regarding multiple arguments
+  - Take package arguments in update [RHBZ#1187136]
+- From Miroslav Suchý <msuchy at redhat.com>:
+  - reset LC before calling lvm commands [RHBZ#1185912]
+
 * Fri Jan 23 2015 Clark Williams <williams at redhat.com> - 1.2.5-1
 - mounts: do not mount /dev/shm or /dev/pts if internal setup false
 - actually package compress_logs plugin
diff --git a/sources b/sources
index 4b6888c..ed63a8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d8d1200d850d082929e2863d7d4c54e  mock-1.2.5.tar.xz
+b7d6c9edd9905ff765f319148a4bdf20  mock-1.2.6.tar.xz


More information about the scm-commits mailing list