[liblastfm] liblastfm-1.0.1
Rex Dieter
rdieter at fedoraproject.org
Tue Jul 3 22:16:25 UTC 2012
commit f4a8dfa5f353f4f3d7ea151ccb27aceff7bdb017
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Jul 3 17:19:39 2012 -0500
liblastfm-1.0.1
.gitignore | 1 +
liblastfm-0.3.2-qmake.patch | 31 -------------
liblastfm.spec | 100 ++++++++++++++++++++++++++-----------------
sources | 2 +-
4 files changed, 63 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c8caf3d..ed71338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz
+/eartle-liblastfm-1.0.1-0-g5b65943.tar.gz
diff --git a/liblastfm.spec b/liblastfm.spec
index d9416e3..165bb0d 100644
--- a/liblastfm.spec
+++ b/liblastfm.spec
@@ -1,84 +1,106 @@
-Name: liblastfm
-Version: 0.3.3
-Release: 5%{?dist}
-Summary: Libraries to integrate Last.fm services
-
-Group: System Environment/Libraries
-License: GPLv2+
-URL: http://github.com/mxcl/liblastfm/tree/master
-# redirect from http://github.com/mxcl/liblastfm/tarball/%{version}
-Source0: http://download.github.com/mxcl-liblastfm-%{version}-0-gf0b3239.tar.gz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Patch1: liblastfm-0.3.2-qmake.patch
-
-BuildRequires: fftw3-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: qt4-devel
+## build/include liblastfm_fingerprint
+#define fingerprint 1
+
+Name: liblastfm
+Version: 1.0.1
+Release: 1%{?dist}
+Summary: Libraries to integrate Last.fm services
+
+Group: System Environment/Libraries
+License: GPLv2+
+URL: https://github.com/eartle/liblastfm
+# https://github.com/eartle/liblastfm/tarball/1.0.1
+Source0: eartle-liblastfm-1.0.1-0-g5b65943.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: pkgconfig(QtNetwork) pkgconfig(QtSql) pkgconfig(QtXml)
BuildRequires: ruby
%description
Liblastfm is a collection of libraries to help you integrate Last.fm services
into your rich desktop software.
+%if 0%{?fingerprint}
+%package fingerprint
+Summary: Liblastfm fingerprint library
+BuildRequires: fftw3-devel
+BuildRequires: pkgconfig(samplerate)
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# upgrade path
+Obsoletes: liblastfm < 1.0
+%description fingerprint
+%{summary}.
+%endif
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?fingerprint}
+Requires: %{name}-fingerprint%{?_isa} = %{version}-%{release}
+%endif
%description devel
%{summary}.
%prep
-# wtf ? -- Rex
-%setup -q -n mxcl-liblastfm-1c739eb
-
-%patch1 -p1 -b .qmake
+%setup -q -n eartle-liblastfm-9b4efb5
%build
-# hack around hard-coded libdir, see qmake patch
-LIB=%{_lib} ; export LIB
-# no autofoo
-./configure \
- --prefix %{_prefix} \
- --no-strip \
- --release
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+ %{?fingerprint:-DBUILD_FINGERPRINT:BOOL=ON} \
+ ..
+popd
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+
+%check
+# TODO: not all tests pass, ping upstream
+make test -C %{_target_platform} ||:
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
-%doc README COPYING
-%{_libdir}/liblastfm.so.0*
-%{_libdir}/liblastfm_fingerprint.so.0*
+%doc COPYING
+%doc README.md
+%{_libdir}/liblastfm.so.1*
+
+%if 0%{?fingerprint}
+%post fingerprint -p /sbin/ldconfig
+%postun fingerprint -p /sbin/ldconfig
+
+%files fingerprint
+%{_libdir}/liblastfm_fingerprint.so.1*
+%endif
%files devel
%defattr(-,root,root,-)
-%{_libdir}/liblastfm.so
-%{_libdir}/liblastfm_fingerprint.so
-%{_includedir}/lastfm.h
+%{_libdir}/liblastfm*.so
%{_includedir}/lastfm/
%changelog
+* Tue Jul 03 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-1
+- liblastfm-1.0.1
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-5
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index ec8b660..ecc7530 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe339bf46aefc515c251200d10262f79 mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz
+0e724473cb39be89230fe27e285ce5f4 eartle-liblastfm-1.0.1-0-g5b65943.tar.gz
More information about the scm-commits
mailing list