[mock/f17] fix error when git merging specfile

[John Clark Williams]

commit 6ff7b207ff8c865d05a511bd3d63e4ff1193c574
Author: Clark Williams <williams at redhat.com>
Date:   Sat Jul 28 10:51:25 2012 -0500

    fix error when git merging specfile

 mock.spec |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/mock.spec b/mock.spec
index 7b8dbf9..e9f612a 100644
--- a/mock.spec
+++ b/mock.spec
@@ -11,12 +11,10 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: %{release_version}
-Release: 2.1%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: https://fedorahosted.org/mock/attachment/wiki/MockTarballs/%{name}-%{version}.tar.gz
-Source1: fedora-17-ppc64.cfg
-Source2: fedora-17-ppc.cfg
 URL: http://fedoraproject.org/wiki/Projects/Mock
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -45,8 +43,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/var/lib/mock
 mkdir -p $RPM_BUILD_ROOT/var/cache/mock
 ln -s consolehelper $RPM_BUILD_ROOT/usr/bin/mock
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mock/
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mock/
 
 # compatibility symlinks
 # (probably be nuked in the future)
@@ -144,12 +140,6 @@ chmod 2775 /var/cache/mock
   - from Masatake YAMATO <yamato at redhat.com>:
     - added option to set a plugin parameter value [BZ# 754321]
 
-* Tue May 08 2012 Karsten Hopp <karsten at redhat.com> 1.1.22-2.1
-- add missing triple quotes to ppc config files
-
-* Fri May 04 2012 Karsten Hopp <karsten at redhat.com> 1.1.22-2
-- add Fedora 17 ppc and ppc64 configs
-
 * Thu Mar 29 2012 Clark Williams <williams at redhat.com> - 1.1.22-1
 - fix SCM problem with SSH_AUTH_SOCK [BZ# 803217]
 - From Chris St Pierre <chris.a.st.pierre at gmail.com>: