diff --git a/.gitignore b/.gitignore index 9e80a51..d1024d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /lilv-0.5.0.tar.bz2 +/lilv-0.14.0.tar.bz2 diff --git a/lilv-0.5.0-_lilv_test.c-from-3609-to-3610.patch b/lilv-0.5.0-_lilv_test.c-from-3609-to-3610.patch deleted file mode 100644 index 13e617d..0000000 --- a/lilv-0.5.0-_lilv_test.c-from-3609-to-3610.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: test/lilv_test.c -=================================================================== ---- test/lilv_test.c (revision 3609) -+++ test/lilv_test.c (revision 3610) -@@ -757,8 +757,16 @@ - TEST_ASSERT(sp1); - -- TEST_ASSERT(!strcmp(lilv_node_as_string(lilv_scale_point_get_label(sp0)), "Sin")); -- TEST_ASSERT(lilv_node_as_float(lilv_scale_point_get_value(sp0)) == 3); -- TEST_ASSERT(!strcmp(lilv_node_as_string(lilv_scale_point_get_label(sp1)), "Cos")); -- TEST_ASSERT(lilv_node_as_float(lilv_scale_point_get_value(sp1)) == 4); -+ TEST_ASSERT( -+ ((!strcmp(lilv_node_as_string(lilv_scale_point_get_label(sp0)), "Sin") -+ && lilv_node_as_float(lilv_scale_point_get_value(sp0)) == 3) -+ && -+ (!strcmp(lilv_node_as_string(lilv_scale_point_get_label(sp1)), "Cos") -+ && lilv_node_as_float(lilv_scale_point_get_value(sp1)) == 4)) -+ || -+ ((!strcmp(lilv_node_as_string(lilv_scale_point_get_label(sp0)), "Cos") -+ && lilv_node_as_float(lilv_scale_point_get_value(sp0)) == 4) -+ && -+ (!strcmp(lilv_node_as_string(lilv_scale_point_get_label(sp1)), "Sin") -+ && lilv_node_as_float(lilv_scale_point_get_value(sp1)) == 3))); - - LilvNode* homepage_p = lilv_new_uri(world, "http://usefulinc.com/ns/doap#homepage"); - LILV_API - uint32_t diff --git a/lilv-0.5.0-lilv_test.c-r4011.patch b/lilv-0.5.0-lilv_test.c-r4011.patch deleted file mode 100644 index 35c2f1a..0000000 --- a/lilv-0.5.0-lilv_test.c-r4011.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurp lilv-0.5.0.orig/test/lilv_test.c lilv-0.5.0/test/lilv_test.c ---- lilv-0.5.0.orig/test/lilv_test.c 2011-09-29 04:26:23.000000000 +0200 -+++ lilv-0.5.0/test/lilv_test.c 2012-03-02 23:58:09.546071126 +0100 -@@ -524,9 +524,9 @@ test_plugin(void) - free(manifest_uri); - free(data_uri); - -- float mins[1]; -- float maxs[1]; -- float defs[1]; -+ float mins[3]; -+ float maxs[3]; -+ float defs[3]; - lilv_plugin_get_port_ranges_float(plug, mins, maxs, defs); - TEST_ASSERT(mins[0] == -1.0f); - TEST_ASSERT(maxs[0] == 1.0f); diff --git a/lilv.spec b/lilv.spec index a07b868..cc3e382 100644 --- a/lilv.spec +++ b/lilv.spec @@ -1,23 +1,19 @@ %global maj 0 Name: lilv -Version: 0.5.0 -Release: 3%{?dist} +Version: 0.14.0 +Release: 1%{?dist} Summary: An LV2 Resource Description Framework Library Group: System Environment/Libraries License: MIT URL: http://drobilla.net/software/lilv/ Source0: http://download.drobilla.net/%{name}-%{version}.tar.bz2 -# correct non-deterministic node retrieval of scale points in test suite, -# and increase the size of the test float array -Patch0: lilv-0.5.0-_lilv_test.c-from-3609-to-3610.patch -Patch1: lilv-0.5.0-lilv_test.c-r4011.patch BuildRequires: doxygen BuildRequires: graphviz BuildRequires: sord-devel >= 0.5.0 -BuildRequires: lv2core-devel >= 4.0 -BuildRequires: python2-devel +BuildRequires: sratom-devel >= 0.2.0 +BuildRequires: lv2-devel >= 1.0.0 BuildRequires: swig %filter_setup @@ -51,8 +47,6 @@ This package contains the python libraries for %{name}. %prep %setup -q -%patch0 -%patch1 -p1 # we'll run ld config sed -i -e 's|bld.add_post_fun(autowaf.run_ldconfig)||' wscript @@ -86,7 +80,7 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.* ./build/test/lilv_test %files -%doc AUTHORS ChangeLog README COPYING +%doc AUTHORS NEWS README COPYING %{_libdir}/lib%{name}-%{maj}.so.* %{_bindir}/lilv-bench %{_bindir}/lv2info @@ -107,6 +101,9 @@ chmod +x %{buildroot}%{_libdir}/lib%{name}-0.so.* %{python_sitearch}/_%{name}.so %changelog +* Fri Apr 20 2012 Brendan Jones - 0.14.0-1 +- New upstream release 0.14.0 +- * Wed Feb 29 2012 Brendan Jones - 0.5.0-3 - Remove redundant build requires, merge python bindings - Move man3 pages to devel package diff --git a/sources b/sources index d012939..ec5154b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88f5a60ef4e217b6c44a4eff4ccf0ce9 lilv-0.5.0.tar.bz2 +d3a93a017bf93d0e6ee8cccc033a0ee9 lilv-0.14.0.tar.bz2