[suil/f17] Further merge changes from master

[Brendan Jones]

commit f6f16b416f767ade3014e397773e3e3078c12698
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Tue May 15 05:21:17 2012 +0200

    Further merge changes from master

 suil.spec |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)
---
diff --git a/suil.spec b/suil.spec
index 669884b..04e31e4 100644
--- a/suil.spec
+++ b/suil.spec
@@ -1,12 +1,7 @@
 %global maj 0
 Name:       suil
-<<<<<<< HEAD
-Version:    0.4.4
-Release:    8%{?dist}
-=======
 Version:    0.6.0
 Release:    2%{?dist}
->>>>>>> master
 Summary:    A lightweight C library for loading and wrapping LV2 plugin UIs
 
 Group:      System Environment/Libraries
@@ -17,12 +12,7 @@ Source0:    http://download.drobilla.net/%{name}-%{version}.tar.bz2
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  python
-<<<<<<< HEAD
-BuildRequires:  lv2core-devel
-BuildRequires:  lv2-ui-devel
-=======
 BuildRequires:  lv2-devel
->>>>>>> master
 # we need to track changess to these toolkits manually due to the 
 # requires filtering below
 BuildRequires:  gtk2-devel
@@ -37,10 +27,7 @@ BuildRequires:  qt4-devel
 %filter_from_requires /.*libg.*/d
 %filter_from_requires /.*libpango.*/d
 %filter_from_requires /.*libQt.*/d
-<<<<<<< HEAD
-=======
 %filter_from_requires /.*libX*/d
->>>>>>> master
 %filter_setup
 
 %description
@@ -82,20 +69,13 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 %postun -p /sbin/ldconfig
 
 %files
-<<<<<<< HEAD
-%doc AUTHORS ChangeLog README COPYING
-=======
 %doc AUTHORS NEWS README COPYING
->>>>>>> master
 %dir %{_libdir}/suil-%{maj}
 %{_libdir}/lib%{name}-*.so.*
 %{_libdir}/suil-%{maj}/libsuil_gtk2_in_qt4.so
 %{_libdir}/suil-%{maj}/libsuil_qt4_in_gtk2.so
-<<<<<<< HEAD
-=======
 %{_libdir}/suil-%{maj}/libsuil_x11_in_qt4.so
 %{_libdir}/suil-%{maj}/libsuil_x11_in_gtk2.so
->>>>>>> master
 
 %files devel
 %{_libdir}/lib%{name}-%{maj}.so
@@ -105,17 +85,10 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.*
 %{_mandir}/man3/%{name}.3.gz
 
 %changelog
-<<<<<<< HEAD
-* Tue May 01 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.4.4-8
-- Add lv2-ui-devel
-
-* Fri Apr 20 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.4.4-7
-=======
 * Fri Apr 20 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.6.0-2
 - New upstream release
 
 * Sat Apr 07 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.4.4-6
->>>>>>> master
 - Add filter_from_requires macro to remove unwanted Gtk/Qt dependancies
 
 * Fri Mar 30 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.4.4-5