From 60652fb342383e42fa3176ab359880a0727b17c9334c0436c54be78e878dccf2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 6 Dec 2017 07:36:07 +0000 Subject: [PATCH] Accepting request 554549 from home:elvigia:branches:multimedia:apps - BuildRequire pkgconfig(x11) instead of xorg-x11-devel OBS-URL: https://build.opensuse.org/request/show/554549 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/zvbi?expand=0&rev=17 --- zvbi.changes | 5 +++++ zvbi.spec | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/zvbi.changes b/zvbi.changes index 91cbad4..6b766de 100644 --- a/zvbi.changes +++ b/zvbi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 5 15:28:02 UTC 2017 - crrodriguez@opensuse.org + +- BuildRequire pkgconfig(x11) instead of xorg-x11-devel + ------------------------------------------------------------------- Tue Sep 24 15:48:07 UTC 2013 - stephan.barth@suse.com diff --git a/zvbi.spec b/zvbi.spec index 3e22448..2985f73 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -1,7 +1,7 @@ # # spec file for package zvbi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -21,7 +21,7 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool -BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(x11) Url: http://zapping.sf.net/ Version: 0.2.35 Release: 0 @@ -32,6 +32,7 @@ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch2: zvbi-automake-1.13.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{!?make_build:%define make_build %{__make} -O %{?_smp_mflags}} %description With "video4linux" drivers only one application at a time can capture @@ -72,12 +73,8 @@ sliced VBI data, and to interpret the data of several popular services. %build ACLOCAL="aclocal -I m4" autoreconf -fi -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=/usr \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --disable-static -make +%configure --disable-static +%make_build %install make DESTDIR="%{buildroot}" install