[nntpgrab/el5/master: 3/3] Merge branch 'master' into el5

[epienbro]

commit c8c5ba99c472a662e41c719e1fe0666fa4b6b013
Merge: 7403efe 8892539
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Sep 6 21:59:15 2010 +0200

    Merge branch 'master' into el5

 nntpgrab.spec                    |    9 +++-
 nntpgrab_0_6_90_commit1722.patch |  111 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 1 deletions(-)
---
diff --cc nntpgrab.spec
index 556beeb,38921cb..057c9fd
--- a/nntpgrab.spec
+++ b/nntpgrab.spec
@@@ -170,9 -172,16 +171,12 @@@ embedded webinterface which doesn't req
  %prep
  %setup -q
  
+ # Backport of upstream commit 1722. Fixes a dependency resolving issue
+ %patch0 -p0
+ 
  
  %build
 -%if 0%{?fedora}
 -%configure --enable-php-module --disable-gtk3 --enable-gtk-doc
 -%else
  %configure --enable-php-module --disable-gtk3
 -%endif
  make %{?_smp_mflags}
  
  # The Qt frontend has a seperate build process