diff --git a/.gitignore b/.gitignore index 10e91c6..bdf544b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /gupnp-1.0.1.tar.xz /gupnp-1.0.2.tar.xz /gupnp-1.0.3.tar.xz -/gupnp-1.1.2.tar.xz diff --git a/gupnp.spec b/gupnp.spec index 4ff3202..d1ebefb 100644 --- a/gupnp.spec +++ b/gupnp.spec @@ -1,20 +1,18 @@ Name: gupnp -Version: 1.1.2 -Release: 1%{?dist} +Version: 1.0.3 +Release: 2%{?dist} Summary: A framework for creating UPnP devices & control points License: LGPLv2+ URL: http://www.gupnp.org/ -Source0: http://download.gnome.org/sources/%{name}/1.1/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/1.0/%{name}-%{version}.tar.xz -BuildRequires: gupnp -BuildRequires: gssdp-devel >= 1.1 +BuildRequires: gssdp-devel >= 0.14.15 BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel >= 1.36 BuildRequires: libsoup-devel BuildRequires: libxml2-devel BuildRequires: libuuid-devel -BuildRequires: meson BuildRequires: vala Requires: dbus @@ -42,20 +40,21 @@ This package contains developer documentation for %{name}. %prep %setup -q +# Use Python 3 +sed -i '1s|^#! /usr/bin/env python$|#!/usr/bin/python3|' tools/gupnp-binding-tool + %build -%meson \ - -Dcontext_manager=network-manager \ - -Dgtk_doc=true -%meson_build +%configure --disable-static --with-context-manager=network-manager +make %{?_smp_mflags} V=1 %install -%meson_install +%make_install -# Temporary ABI compatibility with the old soname -cp -a %{_libdir}/libgupnp-1.0.so.* $RPM_BUILD_ROOT%{_libdir}/ +#Remove libtool archives. +find %{buildroot} -name '*.la' -delete %check -%meson_test +make check %{?_smp_mflags} V=1 %ldconfig_scriptlets @@ -63,26 +62,20 @@ cp -a %{_libdir}/libgupnp-1.0.so.* $RPM_BUILD_ROOT%{_libdir}/ %license COPYING %doc AUTHORS README %{_libdir}/libgupnp-1.0.so.* -%{_libdir}/libgupnp-1.2.so.* -%{_libdir}/girepository-1.0/GUPnP-1.2.typelib +%{_libdir}/girepository-1.0/GUPnP-1.0.typelib %files devel -%{_bindir}/gupnp-binding-tool-1.2 -%{_libdir}/pkgconfig/gupnp-1.2.pc -%{_libdir}/libgupnp-1.2.so -%{_includedir}/gupnp-1.2 -%{_datadir}/gir-1.0/GUPnP-1.2.gir +%{_bindir}/gupnp-binding-tool +%{_libdir}/pkgconfig/gupnp-1.0.pc +%{_libdir}/libgupnp-1.0.so +%{_includedir}/gupnp-1.0 +%{_datadir}/gir-1.0/GUPnP-1.0.gir %{_datadir}/vala/vapi/%{name}* %files docs %doc %{_datadir}/gtk-doc/html/%{name} %changelog -* Mon Feb 25 2019 Kalev Lember - 1.1.2-1 -- Update to 1.1.2 -- Switch to the meson build system -- Ship old soname for temporary ABI compatibility - * Fri Feb 01 2019 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 214ff13..6b888b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gupnp-1.1.2.tar.xz) = e350e3667fa028bb9d863e5b94b8b33a7ec938b21a02ccf292be065e32f8915824db42fc053142d80088da4f0c09ac444fc8abac7519372f7414d0f8aa9516d1 +SHA512 (gupnp-1.0.3.tar.xz) = f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448