Accepting request 538751 from home:pluskalm:branches:multimedia:libs

- Switch to python3
- Run spec cleaner
- Rename devel subpackage

OBS-URL: https://build.opensuse.org/request/show/538751
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/lilv?expand=0&rev=29

lilv.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  3 12:55:41 UTC 2017 - mpluskal@suse.com
+
+- Switch to python3
+- Run spec cleaner
+- Rename devel subpackage
+
 -------------------------------------------------------------------
 Fri Nov  3 08:38:36 UTC 2017 - davejplater@gmail.com
 

lilv.spec

@@ -18,7 +18,6 @@
 
 %define sover 0
 %define sordversion %(pkg-config --modversion sord-0)
-
 Name:           lilv
 Version:        0.24.2
 Release:        0
@@ -29,25 +28,21 @@ Url:            http://drobilla.net/software/lilv/
 Source0:        http://download.drobilla.net/lilv-%{version}.tar.bz2
 Source98:       baselibs.conf
 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 sover unchanged from 0.12, explicitly require here.
-
+Requires(pre):  liblilv-0-%{sover} = %{version}
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
-BuildRequires:  python-devel
+BuildRequires:  python3-devel
-BuildRequires:  python-numpy-devel
+BuildRequires:  python3-numpy-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig(lv2) >= 1.8.0
 BuildRequires:  pkgconfig(serd-0) >= 0.14.0
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(sord-0) >= 0.13
 BuildRequires:  pkgconfig(sratom-0) >= 0.4.0
-Requires(pre):  liblilv-0-%{sover} = %{version}
 
 %description
 Lilv is a C library to make use of LV2 plugins in applications.
@@ -61,33 +56,34 @@ Requires:       libsord-0-0 = %{sordversion}
 %description    -n liblilv-0-%{sover}
 Lilv is a C library to make use of LV2 plugins in applications.
 
-%package        -n liblilv-0-devel
+%package        devel
+Provides:       liblilv-0-devel = %{version}
+Obsoletes:      liblilv-0-devel < %{version}
 Summary:        Development files for liblilv
 Group:          Development/Libraries/C and C++
 Requires:       liblilv-0-%{sover} = %{version}
 
-%description    -n liblilv-0-devel
+%description    devel
 Lilv is a C library to make use of LV2 plugins in applications.
 This subpackage contains the development files for liblilv.
 
-%package        -n python-lilv
+%package        -n python3-lilv
-Summary:        Python bindings for lilv
+Summary:        Python 3 bindings for lilv
 Group:          Development/Libraries/Python
 
-%description    -n python-lilv
+%description    -n python3-lilv
 Lilv is a C library to make use of LV2 plugins in applications.
-This subpackage contains the Python bindings for lilv.
+This subpackage contains the Python 3 bindings for lilv.
 
 %prep
 %setup -q
-#%%patch0 -p1
 echo %{sordversion}
 
 %build
 # TODO: The numpy path here is a hack. Check how to properly fix it.
 export CFLAGS='%{optflags} -I%{python_sitearch}/numpy/core/include/'
 export CXXFLAGS='%{optflags} -I%{python_sitearch}/numpy/core/include/'
-./waf configure \
+python3 ./waf configure \
   --prefix=%{_prefix} \
   --libdir=%{_libdir} \
   --docdir=%{_defaultdocdir} \
@@ -96,21 +92,19 @@ export CXXFLAGS='%{optflags} -I%{python_sitearch}/numpy/core/include/'
   --bindings \
   --docs
 # waf only understands -j, so do not use smp_mflags
-./waf build -v %{?jobs:-j%jobs}
+python3 ./waf build -v %{?_smp_mflags}
 
 %install
-./waf install --destdir=%{?buildroot}
+python3 ./waf install --destdir=%{?buildroot}
-if [ %{python_sitelib} != %{python_sitearch} ]; then
+if [ %{python3_sitelib} != %{python3_sitearch} ]; then
-  mkdir -p %{buildroot}%{python_sitearch}
+  mkdir -p %{buildroot}%{python3_sitearch}
-  mv %{buildroot}%{python_sitelib}/lilv.py %{buildroot}%{python_sitearch}/
+  mv %{buildroot}%{python3_sitelib}/lilv.py %{buildroot}%{python3_sitearch}/
 fi
 
 %post -n liblilv-0-%{sover} -p /sbin/ldconfig
-
 %postun -n liblilv-0-%{sover} -p /sbin/ldconfig
 
 %files
-%defattr(0644,root,root,0755)
 %attr(0755,-,-) %{_bindir}/lilv-bench
 %attr(0755,-,-) %{_bindir}/lv2bench
 %attr(0755,-,-) %{_bindir}/lv2info
@@ -122,21 +116,17 @@ fi
 %{_sysconfdir}/bash_completion.d/lilv
 
 %files -n liblilv-0-%{sover}
-%defattr(0644,root,root,0755)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/liblilv-0.so.%{sover}*
 
-%files -n liblilv-0-devel
+%files devel
-%defattr(0644,root,root,0755)
 %{_libdir}/liblilv-0.so
 %{_includedir}/lilv-0/
 %{_libdir}/pkgconfig/lilv-0.pc
 %{_defaultdocdir}/lilv-0/
 %{_mandir}/man3/*
 
-# Removed %%{python_sitearch}/_lilv.so in version 2.4.2
+%files -n python3-lilv
-%files -n python-lilv
+%{python3_sitearch}/lilv.py
-%defattr(0644,root,root,0755)
-%{python_sitearch}/lilv.py
 
 %changelog