From 8c9336e30b11911868eefa8167dd613e922f45e5 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Jul 28 2019 17:53:26 +0000 Subject: asoundlib.h is alsa/asoundlib.h meanwhile --- diff --git a/libucil-0.9.10-include-alsa.patch b/libucil-0.9.10-include-alsa.patch new file mode 100644 index 0000000..f595dc0 --- /dev/null +++ b/libucil-0.9.10-include-alsa.patch @@ -0,0 +1,11 @@ +--- libucil-0.9.10/src/ucil_alsa.c 2010-01-17 08:49:29.000000000 +0100 ++++ libucil-0.9.10/src/ucil_alsa.c.include-alsa 2019-07-28 19:28:30.425902735 +0200 +@@ -29,7 +29,7 @@ + #include "ucil_alsa.h" + + #include +-#include ++#include + #include + /* #if UCIL_DEBUG */ + #define DEBUG diff --git a/libucil.spec b/libucil.spec index b2ecf31..0f187ce 100644 --- a/libucil.spec +++ b/libucil.spec @@ -3,8 +3,8 @@ Name: libucil Version: 0.9.10 Release: 19%{?dist} License: GPLv2+ -URL: http://www.unicap-imaging.org/ -Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +URL: https://www.unicap-imaging.org/ +Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz # check return value of theora_encode_init() (#627890) Patch0: libucil-0.9.8-bz627890.patch @@ -15,6 +15,9 @@ Patch1: libucil-0.9.10-leaks.patch # fix some compile-time warnings Patch2: libucil-0.9.10-warnings.patch +# asoundlib.h is alsa/asoundlib.h meanwhile +Patch3: libucil-0.9.10-include-alsa.patch + BuildRequires: autoconf, automake, gettext-devel, libtool BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4 BuildRequires: libunicap-devel, glib2-devel, pango-devel, alsa-lib-devel @@ -29,7 +32,7 @@ and graphic overlays onto video images. %package devel Summary: Development files for the ucil library -Requires: %{name} = %{version}-%{release}, pkgconfig, libunicap-devel +Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig, libunicap-devel Obsoletes: unicap-devel <= 0.9.7-1 %description devel @@ -42,6 +45,7 @@ documentation of the library, too. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # fixes for gtk-doc 1.26 sed -i -e '/^DOC_SOURCE_DIR/s/--source-dir=//g' doc/libucil/Makefile.am mkdir -p m4 @@ -50,11 +54,10 @@ autoreconf -fiv %build %configure --disable-rpath --enable-gtk-doc -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # Don't install any static .a and libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la} @@ -62,7 +65,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.{a,la} %ldconfig_scriptlets %files -%doc AUTHORS ChangeLog COPYING README +%license COPYING +%doc AUTHORS ChangeLog README %{_libdir}/%{name}.so.* %files devel