Accepting request 349627 from multimedia:libs

Force lilv to use the version of sord it was built against. Please accept after sord update sr#349613

OBS-URL: https://build.opensuse.org/request/show/349627
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lilv?expand=0&rev=9

lilv-0.20.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:428a39f1265d44c55f2604829a12ade0ea13e1a1022ff937ca2a9ad227bd422a
-size 207948

lilv-0.22.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd279321223ef11ca01551767d3c16d68cb31f689e02320a0b2e37b4f7d17ab4
+size 217207

lilv-rpmlintrc

@@ -0,0 +1 @@
+addFilter("non-conffile-in-etc /etc/bash_completion.d/lilv")

lilv.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Sat Dec 19 08:43:11 UTC 2015 - davejplater@gmail.com
+
+- Force lilv package to use the version of sord that it was built
+  against.
+
+-------------------------------------------------------------------
+Tue Dec  8 23:30:38 UTC 2015 - someuniquename@gmail.com
+
+- Add runtime requirement of sord 0.13 (new API required since 0.22)
+
+-------------------------------------------------------------------
+Tue Dec  8 23:30:38 UTC 2015 - someuniquename@gmail.com
+
+- Update to version 0.22.0, Added lilv-python-bindings-fix.diff
+  backported from unreleased v 0.22.1
+- Upstream changes :
+
+  * Fix loading files with spaces in their path
+  * Add lilv_file_uri_parse() for correct URI to path conversion
+  * Add lilv_node_get_path() for convenient file URI path access
+  * Add lilv_state_emit_port_values() for special port value handling
+  * Add lilv_state_get_uri()
+  * Add lilv_state_delete() for deleting user saved presets
+  * Add lilv_free() for systems picky about such things
+  * Fix lilv_world_ask() to work with wildcards
+  * Fix creation of duplicate manifest entries when saving state
+  * Fix bindings for Python 3
+  * Load discovered owl ontologies as specifications
+  * Expose lilv_world_load_specifications() and
+    lilv_world_load_plugin_classes()
+  * Tolerate passing NULL to lilv_state_restore()
+  * Preserve absolute paths in state if no link directory is given
+  * Fix a few minor/unlikely memory errors
+  * Configure based on compiler target OS for cross-compilation
+  * Fix lilv_realpath() on pre-POSIX-2008 systems
+  * Fix directory walking on some systems (thanks Matt Fischer)
+  * Windows fixes (thanks John Emmas)
+  * Minor documentation improvements
+  * Upgrade to waf 1.8.14
+
 -------------------------------------------------------------------
 Fri Jan 16 17:12:08 UTC 2015 - p.drouand@gmail.com
 

lilv.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lilv
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,23 @@
 
 
 %define soname 0
+%define sordversion %(pkg-config --modversion sord-0)
 
 Name:           lilv
-Version:        0.20.0
+Version:        0.22.0
 Release:        0
 Summary:        A C library to make the use of LV2 plugins as simple as possible
 License:        ISC
 Group:          System/Libraries
 Url:            http://drobilla.net/software/lilv/
 Source0:        http://download.drobilla.net/lilv-%{version}.tar.bz2
+Source99:       lilv-rpmlintrc
+# Patch backported from v 0.22.1 http://dev.drobilla.net/changeset/5759
+Patch0:         lilv-python-bindings-fix.diff
+
+# lilv 0.22 require new API of sord 0.13
+# Since sord soname unchanged from 0.12, explicitly require here.
+
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
@@ -35,8 +43,9 @@ BuildRequires:  python-numpy-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig(lv2) >= 1.8.0
 BuildRequires:  pkgconfig(serd-0) >= 0.14.0
-BuildRequires:  pkgconfig(sord-0) >= 0.12.0
+BuildRequires:  pkgconfig(sord-0) >= 0.13
 BuildRequires:  pkgconfig(sratom-0) >= 0.4.0
+Requires(pre):  liblilv-0-%{soname} = %{version}
 
 %description
 A C library to make the use of LV2 plugins as simple as possible for applications.
@@ -44,6 +53,9 @@ A C library to make the use of LV2 plugins as simple as possible for application
 %package        -n liblilv-0-%{soname}
 Summary:        A C library to make the use of LV2 plugins as simple as possible
 Group:          System/Libraries
+# NOTE: This is the only way to ensure that the correct version of sord is installed.
+# rpmbuild ignores the Requires: tag here.
+Requires(pre):       libsord-0-0 = %{sordversion}
 
 %description    -n liblilv-0-%{soname}
 A C library to make the use of LV2 plugins as simple as possible for applications.
@@ -55,6 +67,7 @@ Requires:       liblilv-0-%{soname} = %{version}
 
 %description    -n liblilv-0-devel
 Development files for liblilv.
+Lilv is a C library to make the use of LV2 plugins as simple as possible for applications.
 
 %package        -n python-lilv
 Summary:        Python bindings for lilv
@@ -62,9 +75,12 @@ Group:          Development/Libraries/Python
 
 %description    -n python-lilv
 Python bindings for lilv.
+Lilv is a C library to make the use of LV2 plugins as simple as possible for applications.
 
 %prep
 %setup -q
+%patch0 -p1
+echo %{sordversion}
 
 %build
 # TODO: The numpy path here is a hack. Check how to properly fix it.