From 0346d00092d731f63e70ff2a66cd4a608f9d0464 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: May 11 2014 08:10:13 +0000 Subject: added patch to build parallel again --- diff --git a/.gitignore b/.gitignore index c0b512e..d37f62b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vdr-plugin-scraper2vdr-30008b3000e6421e6a54d0dc43a2e952e6a6617d.tar.bz2 /vdr-plugin-scraper2vdr-ea862b36b21029890a1a137f06ba3d828c36d372.tar.bz2 +/scraper2vdr-smpbuildfix.patch diff --git a/sources b/sources index e9f7016..77bad21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bbcb264d9fa3c0c003669c79f9204ab vdr-plugin-scraper2vdr-ea862b36b21029890a1a137f06ba3d828c36d372.tar.bz2 +834cddd7b12327b66688c5b7f5b3de99 scraper2vdr-smpbuildfix.patch diff --git a/vdr-scraper2vdr.spec b/vdr-scraper2vdr.spec index c28fbdf..a3ba7cf 100644 --- a/vdr-scraper2vdr.spec +++ b/vdr-scraper2vdr.spec @@ -4,7 +4,7 @@ Name: vdr-scraper2vdr Version: 0.1.2 -Release: 1.%{gitdate}git%{shortcommit}%{?dist} +Release: 2.%{gitdate}git%{shortcommit}%{?dist} Summary: A client plugin which provides scraped metadata from EPGD to other plugins Group: Applications/Multimedia @@ -12,6 +12,8 @@ License: GPL+ URL: http://projects.vdr-developer.org/projects/plg-scraper2vdr Source0: http://projects.vdr-developer.org/git/vdr-plugin-scraper2vdr.git/snapshot/vdr-plugin-scraper2vdr-%{commit}.tar.bz2 Source1: %{name}.conf +# upstream patch for parallel build +Patch0: http://projects.vdr-developer.org/attachments/1702/scraper2vdr-smpbuildfix.patch BuildRequires: libuuid-devel BuildRequires: ImageMagick-c++-devel @@ -33,13 +35,13 @@ the terms of use. %prep %setup -qn vdr-plugin-scraper2vdr-%{commit} +%patch0 -p0 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" %build -# %%{?_smp_mflags} breaks build -make all +make %{?_smp_mflags} all %install make install DESTDIR=%{buildroot} @@ -56,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/scraper2vdr.conf %changelog +* Sun May 11 2014 Martin Gansser - 0.1.2-2.20140510gitea862b3 +- added patch to build parallel again + * Sat May 10 2014 Martin Gansser - 0.1.2-1.20140510gitea862b3 - rebuild for new git release - added Fedora %%optflags for CFLAGS and CXXFLAGS