[xnoise] - Update to 0.1.12 - Specify the correct location for Vala API files in *.pc

[Michel Alexandre Salim]

commit 95eaa633fce198103ae056e6bc347c2e136e6d8c
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 20:36:45 2010 +0100

    - Update to 0.1.12
    - Specify the correct location for Vala API files in *.pc

 .gitignore  |    2 +-
 sources     |    2 +-
 xnoise.spec |   41 +++++++++++++++++++++++++++++++----------
 3 files changed, 33 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06c7286..6c8666e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xnoise-0.1.6.tar.gz
+/xnoise-0.1.12.tar.bz2
diff --git a/sources b/sources
index 9120371..6806f04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33535448fff6a03a8010ee6d490cb5d3  xnoise-0.1.6.tar.gz
+8ac2740e24b923704f8e43ccc72fb97e  xnoise-0.1.12.tar.bz2
diff --git a/xnoise.spec b/xnoise.spec
index 5680d92..82f5d08 100644
--- a/xnoise.spec
+++ b/xnoise.spec
@@ -1,9 +1,14 @@
 # global hgrev   331
+%if 0%{?fedora} > 14
+%global vapi_ver 0.12
+%else
+%global vapi_ver 0.10
+%endif
 
 Name:           xnoise
-Version:        0.1.6
+Version:        0.1.12
 #Release:        0.1.%{hgrev}hg%{?dist}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Tracklist-centric Media Player
 
 Group:          Applications/Multimedia
@@ -11,8 +16,7 @@ License:        GPLv2+
 URL:            http://www.xnoise-media-player.com/
 # hg archive -t tbz2 -r %{hgrev} ../%{name}-%{version}.tar.bz2
 #Source0:        %{name}-%{version}.tar.bz2
-Source0:        http://xnoise.googlecode.com/files/xnoise-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://xnoise.googlecode.com/files/xnoise-%{version}.tar.bz2
 
 # for snapshots
 # BuildRequires:  gnome-common autoconf automake libtool
@@ -49,6 +53,10 @@ 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
@@ -60,11 +68,15 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install \
+%if 0%{?fedora} > 14
+    VAPIDIR=%{_datadir}/vala-%{vapi_ver}/vapi \
+%endif
+    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
+# rm -rf $RPM_BUILD_ROOT%{_share}/locale/default
 %find_lang %{name}
 
 
@@ -91,6 +103,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_bindir}/xnoise
+%{_libdir}/libplaylist.so.*
 %{_datadir}/xnoise
 %{_datadir}/applications/xnoise.desktop
 %{_datadir}/icons/hicolor/*/apps/xnoise.*
@@ -98,15 +111,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/xnoise-1.0
+%{_includedir}/libplaylist-1.0
+%{_libdir}/libplaylist.so
+%{_libdir}/pkgconfig/xnoise-1.0.pc
+%{_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
-%dir %{_datadir}/vala/vapi
-%{_datadir}/vala/vapi/xnoise-1.0.*
-%{_libdir}/pkgconfig/xnoise-1.0.pc
+%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.*
 
 
 %changelog
+* Sat Nov  6 2010 Michel Salim <salimma at fedoraproject.org> - 0.1.12-1
+- Update to 0.1.12
+- Specify the correct location for Vala API files in *.pc
+
 * Fri Jun 25 2010 Michel Salim <salimma at fedoraproject.org> - 0.1.6-2
 - Make xnoise-devel co-own Vala's VAPI dir
 - Remove invalid locale file