[libechonest] 1.1.8 track soname %check: verify pkgconfig sanity

[Rex Dieter]

commit ada476966f41b13bf695d3a6f32260291f0147df
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 2 07:46:31 2011 -0500

    1.1.8
    track soname
    %check: verify pkgconfig sanity

 .gitignore                      |    1 +
 libechonest-1.1.8-version.patch |   12 ++++++++++++
 libechonest.spec                |   25 ++++++++++++++++++++-----
 sources                         |    2 +-
 4 files changed, 34 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4700f99..ed049b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /libechonest-1.1.1.tar.bz2
 /libechonest-1.1.4.tar.bz2
 /libechonest-1.1.5.tar.bz2
+/libechonest-1.1.8.tar.bz2
diff --git a/libechonest-1.1.8-version.patch b/libechonest-1.1.8-version.patch
new file mode 100644
index 0000000..289bb69
--- /dev/null
+++ b/libechonest-1.1.8-version.patch
@@ -0,0 +1,12 @@
+diff -up libechonest-1.1.8/CMakeLists.txt.version libechonest-1.1.8/CMakeLists.txt
+--- libechonest-1.1.8/CMakeLists.txt.version	2011-06-01 15:22:31.290213441 -0500
++++ libechonest-1.1.8/CMakeLists.txt	2011-06-01 15:27:47.292107459 -0500
+@@ -18,7 +18,7 @@ include( ${QT_USE_FILE} )
+ 
+ set( ECHONEST_LIB_MAJOR_VERSION "1" )
+ set( ECHONEST_LIB_MINOR_VERSION "1" )
+-set( ECHONEST_LIB_PATCH_VERSION "5" )
++set( ECHONEST_LIB_PATCH_VERSION "8" )
+ set( ECHONEST_LIB_VERSION "${ECHONEST_LIB_MAJOR_VERSION}.${ECHONEST_LIB_MINOR_VERSION}.${ECHONEST_LIB_PATCH_VERSION}" )
+ 
+ set( ECHONEST_LIB_VERSION_SONAME "${ECHONEST_LIB_MAJOR_VERSION}.${ECHONEST_LIB_MINOR_VERSION}")
diff --git a/libechonest.spec b/libechonest.spec
index 73cd2ca..c9162aa 100644
--- a/libechonest.spec
+++ b/libechonest.spec
@@ -1,5 +1,5 @@
 Name:		libechonest
-Version:	1.1.5
+Version:	1.1.8
 Release:	1%{?dist}
 Summary:	C++ wrapper for the Echo Nest API
 
@@ -9,6 +9,10 @@ URL:		https://projects.kde.org/projects/playground/libs/libechonest
 Source0:	http://pwsp.cleinias.com/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+Patch100: libechonest-1.1.8-version.patch
+
+BuildRequires:	cmake
 BuildRequires:	qjson-devel
 
 
@@ -19,7 +23,7 @@ life easy when trying to use the APIs provided by The Echo Nest.
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description	devel
 The %{name}-devel package contains libraries and header files for
@@ -29,6 +33,8 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
+%patch100 -p1 -b .version
+
 # There are some harmless warnings that stop the build. Upstream informed on IRC.
 sed -i 's|Werror|Wall|' {,src/}CMakeLists.txt
 
@@ -36,8 +42,9 @@ sed -i 's|Werror|Wall|' {,src/}CMakeLists.txt
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -49,6 +56,8 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 rm -rf $RPM_BUILD_ROOT
 
 %check
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion libechonest)" = "%{version}"
 # The tests need active internet connection, which is not available
 # in koji builds
 #make test -C %%{_target_platform}
@@ -61,15 +70,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
-%{_libdir}/%{name}.so.*
+%{_libdir}/libechonest.so.1*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/echonest/
-%{_libdir}/%{name}.so
+%{_libdir}/libechonest.so
+%{_libdir}/pkgconfig/libechonest.pc
 
 
 %changelog
+* Wed Jun 01 2011 Rex Dieter <rdieter at fedoraproject.org> 1.1.8-1
+- 1.1.8
+- track soname
+- %%check: verify pkgconfig sanity
+
 * Tue May 10 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.1.5-1
 - Update to 1.1.5
 
diff --git a/sources b/sources
index 14ee578..91c0588 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfee05ea5dd58b320fce015bf5cb32e5  libechonest-1.1.5.tar.bz2
+1d2751b90bd7914b4e7869c1bbbae0c0  libechonest-1.1.8.tar.bz2