[xnoise] Update to 0.1.16 Now bundles the plugins, obsoleting xnoise-plugins-core

[Michel Alexandre Salim]

commit daa1b68eb9494e8b0c91f21c7e5551cf0f8f61d0
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 22:14:25 2011 +0100

    Update to 0.1.16
    Now bundles the plugins, obsoleting xnoise-plugins-core

 .gitignore  |    2 +-
 sources     |    2 +-
 xnoise.spec |   47 ++++++++++++++++++++---------------------------
 3 files changed, 22 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c8666e..2d5c72d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/xnoise-0.1.12.tar.bz2
+/xnoise-0.1.16.tar.bz2
diff --git a/sources b/sources
index 6806f04..47ed3d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ac2740e24b923704f8e43ccc72fb97e  xnoise-0.1.12.tar.bz2
+b99a610d4ee73399b20cf87c420c12e1  xnoise-0.1.16.tar.bz2
diff --git a/xnoise.spec b/xnoise.spec
index 00942fc..d243e2b 100644
--- a/xnoise.spec
+++ b/xnoise.spec
@@ -1,18 +1,13 @@
 # global hgrev   331
-%if 0%{?fedora} > 14
-%global vapi_ver 0.12
-%else
-%global vapi_ver 0.10
-%endif
 
 Name:           xnoise
-Version:        0.1.12
+Version:        0.1.16
 #Release:        0.1.%{hgrev}hg%{?dist}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Tracklist-centric Media Player
 
 Group:          Applications/Multimedia
-License:        GPLv2+
+License:        GPLv2+ with exceptions
 URL:            http://www.xnoise-media-player.com/
 # hg archive -t tbz2 -r %{hgrev} ../%{name}-%{version}.tar.bz2
 #Source0:        %{name}-%{version}.tar.bz2
@@ -23,7 +18,8 @@ Source0:        http://xnoise.googlecode.com/files/xnoise-%{version}.tar.bz2
 # pulled in by gnome-common for snapshots
 BuildRequires:  pkgconfig
 BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  libnotify-devel
+# Does not work with libnotify-0.7.x yet
+# BuildRequires:  libnotify-devel
 BuildRequires:  libsoup-devel 
 BuildRequires:  sqlite-devel
 BuildRequires:  taglib-devel
@@ -31,6 +27,9 @@ BuildRequires:  unique-devel
 BuildRequires:  vala-devel
 BuildRequires:  desktop-file-utils gettext intltool
 Requires:       hicolor-icon-theme
+# xnoise >= 0.1.14 bundles the plug-ins
+Provides:       xnoise-plugins-core = %{version}-%{release}
+Obsoletes:      xnoise-plugins-core < %{version}-%{release}
 
 %description
 Xnoise is a Gtk+ media player with a tracklist-centric design. The
@@ -53,32 +52,22 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-for f in $(find data/misc/ -name '*.pc.in');
-do
-    sed -i "s|@datadir@/vala/vapi|@datadir@/vala-%{vapi_ver}/vapi|" $f
-done
 
 
 %build
 # for snapshot builds
 #NOCONFIGURE=1 ./autogen.sh
-%configure
+%configure --disable-notifications
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-%if 0%{?fedora} > 14
-    VAPIDIR=%{_datadir}/vala-%{vapi_ver}/vapi \
-%endif
-    DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/xnoise.desktop
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 # remove invalid locale file
 rm -rf $RPM_BUILD_ROOT%{_share}/locale/default
-# own %%{_libdir}/xnoise directory for plugins
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/xnoise
 
 %find_lang %{name}
 
@@ -105,10 +94,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc AUTHORS COPYING README
 %{_bindir}/xnoise
 %{_libdir}/libplaylist.so.*
-%dir %{_libdir}/xnoise
+%{_libdir}/xnoise
 %{_datadir}/xnoise
 %{_datadir}/applications/xnoise.desktop
-%{_datadir}/icons/hicolor/*/apps/xnoise.*
+%{_datadir}/icons/hicolor/*/apps/xnoise*
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,13 +108,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/pkgconfig/libplaylist-1.0.pc
 # make package own the vala API dir:
 # xnoise plugins don't have to be written in vala
-%dir %{_datadir}/vala-%{vapi_ver}
-%dir %{_datadir}/vala-%{vapi_ver}/vapi
-%{_datadir}/vala-%{vapi_ver}/vapi/xnoise-1.0.*
-%{_datadir}/vala-%{vapi_ver}/vapi/libplaylist-1.0.*
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/xnoise-1.0.*
+%{_datadir}/vala/vapi/libplaylist-1.0.*
 
 
 %changelog
+* Sun Mar 13 2011 Michel Salim <salimma at fedoraproject.org> - 0.1.16-1
+- Update to 0.1.16
+- Now bundles the plugins, obsoleting xnoise-plugins-core
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild