commit 4f06e5c3ca8ab85bb926407255e43ba615932272
Author: Jan Rękorajski <[email protected]>
Date: Wed Aug 28 20:12:04 2013 +0200
- 2.8.0
amarok-upnp-dep.patch | 9 +++++----
amarok.spec | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/amarok.spec b/amarok.spec
index c3140fd..0db6c87 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -14,12 +14,12 @@
Summary: A KDE audio player
Summary(pl.UTF-8): Odtwarzacz audio dla KDE
Name: amarok
-Version: 2.6.0
-Release: 2
+Version: 2.8.0
+Release: 1
License: GPL v2+ and LGPL v2.1+
Group: X11/Applications/Multimedia
Source0:
ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 116f53c1109c7acd1ac7d78ec75c01c4
+# Source0-md5: 53cfcb4819668b10e13b061478c7b32a
Patch0: %{name}-upnp-dep.patch
URL: http://amarok.kde.org/
BuildRequires: QtNetwork-devel >= %{qtver}
diff --git a/amarok-upnp-dep.patch b/amarok-upnp-dep.patch
index c41c74b..1f1a943 100644
--- a/amarok-upnp-dep.patch
+++ b/amarok-upnp-dep.patch
@@ -9,13 +9,13 @@ diff -urN amarok-2.4.0.90.orig/CMakeLists.txt
amarok-2.4.0.90/CMakeLists.txt
+ macro_optional_find_package(HUpnp)
+ macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and
Play Library" "http://herqq.org/"; FALSE "" "" )
+
- # macro_optional_find_package(Strigi)
- # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files"
"http://strigi.sourceforge.net"; FALSE "" "" )
-
+ # We tell users that we need 1.0.3, but we really check just >= 1.0.0.
This is because
+ # upstream forgot to update version in lastfm/global.h, so it looks like
1.0.2. :-(
+ # will be fixed in liblastfm-1.0.4
diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt
amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
--- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt
2011-04-19 00:03:27.940000015 +0000
+++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt 2011-04-19
00:07:06.753333348 +0000
-@@ -25,4 +25,6 @@
+@@ -25,5 +25,7 @@
if( QJSON_FOUND )
add_subdirectory( playdarcollection )
endif( QJSON_FOUND )
@@ -23,6 +23,7 @@ diff -urN
amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2
+if( HUPNP_FOUND )
+ add_subdirectory( upnpcollection )
+endif( HUPNP_FOUND )
+ add_subdirectory( nepomukcollection )
diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake
amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
--- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake 2011-04-19
01:59:14.313333349 +0000
+++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake 2011-04-19
02:14:13.670000016 +0000
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/amarok.git/commitdiff/4f06e5c3ca8ab85bb926407255e43ba615932272
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
