[liblastfm] 1.0.9-1

Rex Dieter rdieter at fedoraproject.org
Thu Jan 1 19:21:20 UTC 2015


commit b9c71eb51e3183dcf7bc037c7d2d113e15a7a800
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jan 1 13:21:29 2015 -0600

    1.0.9-1
    
    - 1.0.9
    - start work on qt5 support

 .gitignore     |    1 +
 liblastfm.spec |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 sources        |    2 +-
 3 files changed, 47 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df1005c..57f7634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /liblastfm-1.0.8-0875757.tar.gz
+/liblastfm-1.0.9-fb089f6.tar.gz
diff --git a/liblastfm.spec b/liblastfm.spec
index f107ad0..0fab068 100644
--- a/liblastfm.spec
+++ b/liblastfm.spec
@@ -2,14 +2,17 @@
 ## build/include liblastfm_fingerprint
 %define fingerprint 1
 
+## needs work -- rex
+#define qt5 1
+
 # see http://fedoraproject.org/wiki/Packaging:SourceURL#Github
-%global commit 0875757fe8c253b67710d6c1f3700ed140a4a7ba
+%global commit fb089f6f707c6375ff5ebc12d536e0d9bc09ed10
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:	 liblastfm
 Summary: Libraries to integrate Last.fm services
-Version: 1.0.8
-Release: 3%{?dist}
+Version: 1.0.9
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     https://github.com/lastfm/liblastfm
@@ -50,30 +53,60 @@ Requires: %{name}-fingerprint%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
+%if 0%{?qt5}
+%package -n liblastfm-qt5
+Summary: Qt5 libraries to integrate Last.fm services
+BuildRequires: pkgconfig(Qt5Core) pkgconfig(Qt5DBus)
+%description -n liblastfm-qt5
+%{summary}.
+
+%package -n liblastfm-qt5-devel
+Summary: Development files for liblastfm-qt5
+Requires: liblastfm-qt5%{?_isa} = %{version}-%{release}
+%description -n liblastfm-qt5-devel
+%{summary}.
+%endif
+
+
 
 %prep
 %setup -qn %{name}-%{commit}
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_cmd} \
+%{cmake_cmd} .. \
   -DBUILD_FINGERPRINT:BOOL=%{?fingerprint:ON}%{!?fingerprint:OFF} \
-  -DBUILD_WITH_QT4:BOOL=ON \
-  ..
+  -DBUILD_WITH_QT4:BOOL=ON
+
+make %{?_smp_mflags}
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%if 0%{?qt5}
+mkdir %{_target_platform}-qt5
+pushd %{_target_platform}-qt5
+%{cmake_cmd} .. \
+  -DBUILD_FINGERPRINT:BOOL=%{?fingerprint:ON}%{!?fingerprint:OFF} \
+  -DBUILD_WITH_QT4:BOOL=OFF
+
+make %{?_smp_mflags}
+%endif
 
 
 %install
+%if 0%{?qt5}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5
+%endif
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %check
 # TODO: not all tests pass, ping upstream
 make test -C %{_target_platform} ||:
+%if 0%{?qt5}
+make test -C %{_target_platform}-qt5 ||:
+%endif
 
 
 %post -p /sbin/ldconfig
@@ -98,6 +131,10 @@ make test -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Jan 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 1.0.9-1
+- 1.0.9
+- start work on qt5 support
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 2f5549f..c3cbe09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82d604a89036417e8f430e54d1ec2b66  liblastfm-1.0.8-0875757.tar.gz
+da244df5965f88df3238c582ea3b2380  liblastfm-1.0.9-fb089f6.tar.gz


More information about the scm-commits mailing list