From 661eb91a03aa67d15a3586a14805ec422cbcce57 Mon Sep 17 00:00:00 2001
From: Brendan Jones <brendan.jones.it@gmail.com>
Date: May 11 2012 04:18:55 +0000
Subject: Fix merging


---

diff --git a/lv2-abGate.spec b/lv2-abGate.spec
index 7f7760e..f045c99 100644
--- a/lv2-abGate.spec
+++ b/lv2-abGate.spec
@@ -1,7 +1,7 @@
 %global pname abGate
 Name:           lv2-abGate
 Version:        1.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An LV2 Noice Gate
 
 Group:          Applications/Multimedia
@@ -18,7 +18,7 @@ A Noise Gate plugin
 %prep
 %setup -q -n %{pname}-%{version}
 sed -i -e 's|-O3|%{optflags}|' Makefile
-%ifarch x86_64
+%if %{_lib} == "lib64"
    sed -i -e 's|\/lib|\/lib64|' Makefile plugin_configuration.h
 %endif
 
@@ -47,6 +47,13 @@ make install DESTDIR=%{buildroot}
 * Fri May 11 2012 Brendan Jones <brendan.jones.it@gmail.com> 1.1.3-3
 - Build against new lv2
 
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-4
+- Rebuilt for c++ ABI breakage
+
+* Fri Jan 20 2012 Dan Horák <dan[at]danny.cz> 1.1.3-3
+- fix build on non-x86 64-bit arches
+>>>>>>> ba382b17325e27884aad8cddbeceae1fc61307f9
+
 * Fri Jan 6 2012 Brendan Jones <brendan.jones.it@gmail.com> 1.1.3-2
 - Removed lv2config