[suil/f17: 4/4] Merge changes from master

[Brendan Jones]

commit 9ba0e7dd31b2b5d07e8bc621fe343328e766e4ae
Merge: 111b930 df19992
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Tue May 15 05:19:03 2012 +0200

    Merge changes from master

 sources   |    4 ++++
 suil.spec |   29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --cc sources
index 82e796e,7a3eb3f..e8a2025
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ace6a58b4e7b748e1506184760502b63  suil-0.4.4.tar.bz2
++=======
+ 3c655c065569945bea570b1dc78b92e2  suil-0.6.0.tar.bz2
++>>>>>>> master
diff --cc suil.spec
index 6fdc549,04e31e4..669884b
--- a/suil.spec
+++ b/suil.spec
@@@ -1,7 -1,7 +1,12 @@@
  %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
@@@ -12,8 -12,7 +17,12 @@@ Source0:    http://download.drobilla.ne
  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
@@@ -28,6 -27,7 +37,10 @@@ BuildRequires:  qt4-deve
  %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
@@@ -69,11 -69,13 +82,20 @@@ chmod +x %{buildroot}%{_libdir}/lib%{na
  %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
@@@ -83,10 -85,10 +105,17 @@@
  %{_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