[compiz-plugins-unsupported/f18: 5/5] fix merge conflicts

[Wolfgang Ulbrich]

commit 89c9069c57720c996c1cbcd4c3c6e7ae52d50f95
Merge: 7a92a00 871c53c
Author: raveit <chat-to-me at raveit.de>
Date:   Sun May 26 23:29:16 2013 +0200

    fix merge conflicts

 compiz-plugins-unsupported-aarch64.patch       | 1149 ++++++++++++++++++++++++
 compiz-plugins-unsupported.spec                |   14 +-
 compiz-plugins-unsupported_automake-1.13.patch |   84 ++
 compiz-plugins-unsupported_mate.patch          |  622 -------------
 4 files changed, 1246 insertions(+), 623 deletions(-)
---
diff --cc compiz-plugins-unsupported.spec
index c79188e,c70f3b6..4b12fa0
--- a/compiz-plugins-unsupported.spec
+++ b/compiz-plugins-unsupported.spec
@@@ -2,7 -2,7 +2,7 @@@
   
  Name:    compiz-plugins-unsupported
  Version: 0.8.8
- Release: 7%{?dist}
 -Release: 9%{?dist}
++Release: 8%{?dist}
  Epoch:   1
  Summary: Additional plugins for Compiz
  Group:   User Interface/Desktops
@@@ -77,7 -83,13 +83,13 @@@ find $RPM_BUILD_ROOT -name '*.a' -exec 
  
  
  %changelog
 -* Sat May 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1:0.8.8-9
++* Sat May 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1:0.8.8-8
+ - fix build for aarch64
+ - add autoreconf and BR libtool
+ - fix bogus date in %%changelog
+ - fix automake-1.13 build deprecations
+ 
 -* Wed Apr 24 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1:0.8.8-8
 +* Wed Apr 24 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1:0.8.8-7
  - rework mate patch
  - remove gconf usage