Hello community,

here is the log from the commit of package liblastfm for openSUSE:Factory 
checked in at 2012-09-10 16:11:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/liblastfm (Old)
 and      /work/SRC/openSUSE:Factory/.liblastfm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "liblastfm", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/liblastfm/liblastfm.changes      2012-05-16 
21:08:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.liblastfm.new/liblastfm.changes 2012-09-10 
16:12:01.000000000 +0200
@@ -1,0 +2,38 @@
+Thu Sep  6 15:22:20 UTC 2012 - dmuel...@suse.com
+
+- rename it back to liblastfm-devel
+
+-------------------------------------------------------------------
+Thu Aug 23 20:08:00 UTC 2012 - d...@dominik-schmidt.de
+
+- fix no-return-in-nonvoid-function issue
+
+-------------------------------------------------------------------
+Thu Aug 23 19:47:05 UTC 2012 - d...@dominik-schmidt.de
+
+- Update to 1.0.2
+  * liblastfm_fingerprint is now built on default
+  * slightly extended api
+  * bugfixes 
+
+-------------------------------------------------------------------
+Thu Aug 23 16:27:49 UTC 2012 - d...@dominik-schmidt.de
+
+- also rename the devel package to liblastfm1-devel and make it
+  conflict with the liblastfm-devel package 
+
+-------------------------------------------------------------------
+Wed Aug 22 11:53:51 UTC 2012 - d...@dominik-schmidt.de
+
+- change name to liblastfm1, so devel package doesnt collide with
+  old liblastfm still required by stable amarok
+
+-------------------------------------------------------------------
+Tue Aug 21 13:46:06 UTC 2012 - d...@dominik-schmidt.de
+
+- Update to 1.0.1
+* proper cmake based build system
+* needed for latest tomahawk release
+* support for showing your player on your last.fm profile
+
+-------------------------------------------------------------------

Old:
----
  liblastfm-ruby19.patch
  liblastfm-sort.patch
  liblastfm_qmake.patch
  mxcl-liblastfm-0.3.3-0-gf0b3239.tar.bz2

New:
----
  liblastfm-1.0.2.tar.gz
  liblastfm-fix-no-return-in-nonvoid-function.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ liblastfm.spec ++++++
--- /var/tmp/diff_new_pack.EAAS1E/_old  2012-09-10 16:12:03.000000000 +0200
+++ /var/tmp/diff_new_pack.EAAS1E/_new  2012-09-10 16:12:03.000000000 +0200
@@ -17,39 +17,40 @@
 #
 
 
+%define _soversion 1
+
 Name:           liblastfm
-Version:        0.3.3
+Version:        1.0.2
 Release:        0
 Summary:        A Qt C++ Library for the Last.fm Webservices
 License:        GPL-3.0+
 Group:          System/Libraries
 Url:            http://github.com/mxcl/liblastfm
-# https://download.github.com/mxcl-liblastfm-0.3.3-0-gf0b3239.zip
-Source0:        mxcl-liblastfm-%{version}-0-gf0b3239.tar.bz2
-# PATCH-FIX-OPENSUSE liblastfm_qmake.patch -- Fix hard-coded libdir
-Patch0:         liblastfm_qmake.patch
-# PATCH-FIX-OPENSUSE liblastfm-sort.patch a...@suse.de -- Sort lastfm.h to 
have same order each build
-Patch1:         liblastfm-sort.patch
-# PATCH-FIX-OPENSUSE liblastfm-ruby19.patch idoen...@suse.de -- Fix build with 
Ruby 1.9
-Patch2:         liblastfm-ruby19.patch
+# http://cdn.last.fm/client/liblastfm-%%{version}.tar.gz
+Source0:        liblastfm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+# PATCH-FIX-UPSTREAM liblastfm-fix-no-return-in-nonvoid-function.diff
+Patch0:         liblastfm-fix-no-return-in-nonvoid-function.diff
+
+BuildRequires:  cmake
+BuildRequires:  kde4-filesystem
+
 BuildRequires:  fdupes
 BuildRequires:  fftw3-devel
-BuildRequires:  libqt4-devel >= 4.4.0
+BuildRequires:  libqt4-devel >= 4.8.0
 BuildRequires:  libsamplerate-devel
-BuildRequires:  ruby
-Requires:       ruby
 
 %description
 liblastfm is a collection of libraries to help you integrate Last.fm services
 into your rich desktop software. It is officially supported software developed
 by Last.fm staff.
 
-%package -n liblastfm0
+%package -n liblastfm%{_soversion}
 Summary:        A Qt C++ Library for the Last.fm Webservices
 Group:          System/Libraries
 
-%description -n liblastfm0
+%description -n liblastfm%{_soversion}
 liblastfm is a collection of libraries to help you integrate Last.fm services
 into your rich desktop software. It is officially supported software developed
 by Last.fm staff.
@@ -57,7 +58,7 @@
 %package -n liblastfm-devel
 Summary:        Development Files for the Last.fm Webservices
 Group:          Development/Libraries/C and C++
-Requires:       liblastfm0 = %{version}
+Requires:       liblastfm%{_soversion} = %{version}
 Requires:       libqt4-devel
 
 %description -n liblastfm-devel
@@ -68,40 +69,32 @@
 This package contains development files for liblastfm.
 
 %prep
-%setup -qn mxcl-liblastfm-1c739eb
+%setup -n %{name}-%{version}
 %patch0 -p1
-%patch1
-%if 0%{?suse_version} >= 1220
-%patch2 -p1
-%endif
 
 %build
-  export LIB=%{_lib}
-  ./configure --prefix %{_prefix} --release --no-strip
-  make CXXFLAGS+="%{optflags} -fPIC -fvisibility-inlines-hidden" 
%{?_smp_mflags} VERBOSE=1
+%{cmake_kde4}
+make VERBOSE=1
 
 %install
-  make DESTDIR=%{buildroot} install
-  %fdupes -s %{buildroot}
+%{kde4_makeinstall}
 
 %clean
-  rm -rf %{buildroot}
+rm -rf %{buildroot}
 
-%post -n liblastfm0 -p /sbin/ldconfig
+%post -n liblastfm%{_soversion} -p /sbin/ldconfig
 
-%postun -n liblastfm0 -p /sbin/ldconfig
+%postun -n liblastfm%{_soversion} -p /sbin/ldconfig
 
-%files -n liblastfm0
+%files -n liblastfm%{_soversion}
 %defattr(-,root,root,-)
-%doc COPYING README
-%{_libdir}/liblastfm.so.0*
-%{_libdir}/liblastfm_fingerprint.so.0*
+%{_libdir}/liblastfm.so.*
+%{_libdir}/liblastfm_fingerprint.so.*
 
 %files -n liblastfm-devel
 %defattr(-,root,root,-)
-%{_libdir}/liblastfm_fingerprint.so
 %{_libdir}/liblastfm.so
-%{_includedir}/lastfm.h
+%{_libdir}/liblastfm_fingerprint.so
 %{_includedir}/lastfm
 
 %changelog

++++++ liblastfm-fix-no-return-in-nonvoid-function.diff ++++++
diff --git a/src/fingerprint/Fingerprint.cpp b/src/fingerprint/Fingerprint.cpp
index 8f09636..70d2511 100644
--- a/src/fingerprint/Fingerprint.cpp
+++ b/src/fingerprint/Fingerprint.cpp
@@ -363,4 +363,6 @@ QDebug operator<<( QDebug d, lastfm::Fingerprint::Error e )
         CASE(InternalError)
     }
     #undef CASE
+
+    return d;
 }
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to